diff options
author | Helge Deller <deller@gmx.de> | 2020-04-26 12:55:39 +0200 |
---|---|---|
committer | Jason Wang <jasowang@redhat.com> | 2020-06-18 21:05:51 +0800 |
commit | d9b69640391618045949f7c500b87fc129f862ed (patch) | |
tree | 0d3270d2157253f2a9c417a53bd72374dc882535 /hw/net | |
parent | dd3d85e89123c907be7628957457af3d03e3b85b (diff) | |
download | qemu-d9b69640391618045949f7c500b87fc129f862ed.zip qemu-d9b69640391618045949f7c500b87fc129f862ed.tar.gz qemu-d9b69640391618045949f7c500b87fc129f862ed.tar.bz2 |
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")
Buglink: https://bugs.launchpad.net/bugs/1874539
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'hw/net')
-rw-r--r-- | hw/net/tulip.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/hw/net/tulip.c b/hw/net/tulip.c index 6cefc0a..57ecbe2 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -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; |