[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] rtl8139: limit transmission buffer size in c+ m
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PATCH 1/6] rtl8139: limit transmission buffer size in c+ mode |
Date: |
Mon, 05 Mar 2012 11:08:24 +0800 |
User-agent: |
StGit/0.15 |
The tx buffer would be re-allocated for tx descriptor with big size
and without LS bit set, this would make guest driver could easily let
qemu to allocate unlimited.
In linux host, a glib failure were easy to be triggered:
GLib-ERROR **: gmem.c:176: failed to allocate 18446744071562067968 bytes
This patch fix this by adding a limit. As the spec didn't tell the maximum size
of buffer allowed, stick it to current CP_TX_BUFFER_SIZE (65536).
Signed-off-by: Jason Wang <address@hidden>
---
hw/rtl8139.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 05b8e1e..d9e742c 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -2063,11 +2063,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
while (s->cplus_txbuffer && s->cplus_txbuffer_offset + txsize >=
s->cplus_txbuffer_len)
{
- s->cplus_txbuffer_len += CP_TX_BUFFER_SIZE;
- s->cplus_txbuffer = g_realloc(s->cplus_txbuffer,
s->cplus_txbuffer_len);
-
- DPRINTF("+++ C+ mode transmission buffer space changed to %d\n",
- s->cplus_txbuffer_len);
+ /* The spec didn't tell the maximum size, stick to CP_TX_BUFFER_SIZE */
+ txsize = s->cplus_txbuffer_len - s->cplus_txbuffer_offset;
+ DPRINTF("+++ C+ mode transmission buffer overrun, truncated descriptor"
+ "length to %d\n", txsize);
}
if (!s->cplus_txbuffer)
- [Qemu-devel] [PATCH 1/6] rtl8139: limit transmission buffer size in c+ mode,
Jason Wang <=
- [Qemu-devel] [PATCH 2/6] rtl8139: remove unused marco, Jason Wang, 2012/03/04
- [Qemu-devel] [PATCH 4/6] net: move compute_mcast_idx() to net.h, Jason Wang, 2012/03/04
- [Qemu-devel] [PATCH 3/6] rtl8139: support byte read to TxStatus registers, Jason Wang, 2012/03/04
- [Qemu-devel] [PATCH 5/6] rtl8139: correctly check the opmode, Jason Wang, 2012/03/04
- [Qemu-devel] [PATCH 6/6] rtl8139: do the network/host communication only in normal operating mode, Jason Wang, 2012/03/04
- Re: [Qemu-devel] [PATCH 1/6] rtl8139: limit transmission buffer size in c+ mode, Stefan Hajnoczi, 2012/03/05
- [Qemu-devel] [1/6 V2 PATCH] rtl8139: limit transmission buffer size in c+ mode, Jason Wang, 2012/03/06