qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH][STABLE] Musicpal: Fix descriptor walk in eth_se


From: Anthony Liguori
Subject: Re: [Qemu-devel] [PATCH][STABLE] Musicpal: Fix descriptor walk in eth_send
Date: Tue, 26 Jan 2010 16:21:21 -0600
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-4.fc12 Lightning/1.0pre Thunderbird/3.0

On 01/24/2010 02:51 AM, Jan Kiszka wrote:
Commit 930c86820e introduced a regression to eth_send: eth_tx_desc_put
manipulates the host's tx descriptor copy before writing it back, but
two lines down the descriptor is evaluated again, leaving us with an
invalid next address if host and guest endianness differ. So this was
the actual issue commit 2e87c5b937 tried to paper over.

Signed-off-by: Jan Kiszka<address@hidden>
Applied to stable.  Thanks.

Regards,

Anthony Liguori
---
  hw/musicpal.c |    7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/musicpal.c b/hw/musicpal.c
index e424a7d..b8af15e 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -238,14 +238,13 @@ static void eth_send(mv88w8618_eth_state *s, int 
queue_index)
  {
      uint32_t desc_addr = s->tx_queue[queue_index];
      mv88w8618_tx_desc desc;
+    uint32_t next_desc;
      uint8_t buf[2048];
      int len;

-    if (!desc_addr) {
-        return;
-    }
      do {
          eth_tx_desc_get(desc_addr,&desc);
+        next_desc = desc.next;
          if (desc.cmdstat&  MP_ETH_TX_OWN) {
              len = desc.bytes;
              if (len<  2048) {
@@ -256,7 +255,7 @@ static void eth_send(mv88w8618_eth_state *s, int 
queue_index)
              s->icr |= 1<<  (MP_ETH_IRQ_TXLO_BIT - queue_index);
              eth_tx_desc_put(desc_addr,&desc);
          }
-        desc_addr = desc.next;
+        desc_addr = next_desc;
      } while (desc_addr != s->tx_queue[queue_index]);
  }






reply via email to

[Prev in Thread] Current Thread [Next in Thread]