Skip to contentSkip to conversation

Fix tulip breakage

PATCH In review Helge Deller 2 participants 2 messages Apr 26, 2020 – Apr 27, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Fix tulip breakage

The tulip network driver in a qemu-system-hppa emulation is broken in the sense that bigger network packages aren't received any longer and thus even running e.g. "apt update" inside the VM fails.

The breakage was introduced by commit 8ffb7265af ("check frame size and r/w data length") which added checks to prevent accesses outside of the rx/tx buffers.

But the new checks were implemented wrong. The variable rx_frame_len counts backwards, from rx_frame_size down to zero, and the variable len is never bigger than rx_frame_len, so accesses just can't happen and the checks are unnecessary.
On the contrary the checks now prevented bigger packages to be moved into the rx buffers.

This patch reverts the wrong checks and were sucessfully tested with a qemu-system-hppa emulation.

Fixes 8ffb7265af ("check frame size and r/w data length")

---
changes v2 to v1:
- renamed patch title
- rephrased commit message
- no changes to patch itself

hw/net/tulip.c +0 -6
index 1295f51d07..59d21defcc 100644
@@ -171,9 +171,6 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
             len = s->rx_frame_len;
         }
 
-        if (s->rx_frame_len + len > sizeof(s->rx_frame)) {
-            return;
-        }
         pci_dma_write(&s->dev, desc->buf_addr1, s->rx_frame +
             (s->rx_frame_size - s->rx_frame_len), len);
         s->rx_frame_len -= len;
@@ -186,9 +183,6 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
             len = s->rx_frame_len;
         }
 
-        if (s->rx_frame_len + len > sizeof(s->rx_frame)) {
-            return;
-        }
         pci_dma_write(&s->dev, desc->buf_addr2, s->rx_frame +
             (s->rx_frame_size - s->rx_frame_len), len);
         s->rx_frame_len -= len;
#1 lore raw
Quoted 43 lines · Helge Deller

The tulip network driver in a qemu-system-hppa emulation is broken in the sense that bigger network packages aren't received any longer and thus even running e.g. "apt update" inside the VM fails.

The breakage was introduced by commit 8ffb7265af ("check frame size and r/w data length") which added checks to prevent accesses outside of the rx/tx buffers.

But the new checks were implemented wrong. The variable rx_frame_len counts backwards, from rx_frame_size down to zero, and the variable len is never bigger than rx_frame_len, so accesses just can't happen and the checks are unnecessary.
On the contrary the checks now prevented bigger packages to be moved into the rx buffers.

This patch reverts the wrong checks and were sucessfully tested with a qemu-system-hppa emulation.

Fixes 8ffb7265af ("check frame size and r/w data length")

---
changes v2 to v1:
- renamed patch title
- rephrased commit message
- no changes to patch itself

hw/net/tulip.c +0 -3
index 1295f51d07..59d21defcc 100644
@@ -171,9 +171,6 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
              len = s->rx_frame_len;
          }
 
-        if (s->rx_frame_len + len > sizeof(s->rx_frame)) {
-            return;
-        }
          pci_dma_write(&s->dev, desc->buf_addr1, s->rx_frame +
              (s->rx_frame_size - s->rx_frame_len), len);
          s->rx_frame_len -= len;

hw/net/tulip.c static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc) · line 188

Quoted 9 lines
hw/net/tulip.c +0 -3
@@ -186,9 +183,6 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
              len = s->rx_frame_len;
          }
 
-        if (s->rx_frame_len + len > sizeof(s->rx_frame)) {
-            return;
-        }
          pci_dma_write(&s->dev, desc->buf_addr2, s->rx_frame +
              (s->rx_frame_size - s->rx_frame_len), len);
          s->rx_frame_len -= len;

Queued for 5.1 and stable.

Thanks