[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] net: mipsnet: check transmit buffer size before
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 2/5] net: mipsnet: check transmit buffer size before sending |
Date: |
Tue, 28 Jun 2016 11:35:07 +0800 |
From: Prasad J Pandit <address@hidden>
When processing MIPSnet I/O port write operation, it uses a
transmit buffer tx_buffer[MAX_ETH_FRAME_SIZE=1514]. Two indices
's->tx_written' and 's->tx_count' are used to control data written
to this buffer. If the two were to be equal before writing, it'd
lead to an OOB write access beyond tx_buffer. Add check to avoid it.
Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/mipsnet.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c
index cf8b823..5115adc 100644
--- a/hw/net/mipsnet.c
+++ b/hw/net/mipsnet.c
@@ -183,10 +183,12 @@ static void mipsnet_ioport_write(void *opaque, hwaddr
addr,
break;
case MIPSNET_TX_DATA_BUFFER:
s->tx_buffer[s->tx_written++] = val;
- if (s->tx_written == s->tx_count) {
+ if ((s->tx_written >= MAX_ETH_FRAME_SIZE)
+ || (s->tx_written == s->tx_count)) {
/* Send buffer. */
- trace_mipsnet_send(s->tx_count);
- qemu_send_packet(qemu_get_queue(s->nic), s->tx_buffer,
s->tx_count);
+ trace_mipsnet_send(s->tx_written);
+ qemu_send_packet(qemu_get_queue(s->nic),
+ s->tx_buffer, s->tx_written);
s->tx_count = s->tx_written = 0;
s->intctl |= MIPSNET_INTCTL_TXDONE;
s->busy = 1;
--
2.7.4
- [Qemu-devel] [PULL 0/5] Net patches, Jason Wang, 2016/06/27
- [Qemu-devel] [PULL 2/5] net: mipsnet: check transmit buffer size before sending,
Jason Wang <=
- [Qemu-devel] [PULL 3/5] Change net/socket.c to use socket_*() functions, Jason Wang, 2016/06/27
- [Qemu-devel] [PULL 1/5] net: fix qemu_announce_self not emitting packets, Jason Wang, 2016/06/27
- [Qemu-devel] [PULL 4/5] rtl8139: save/load RxMulOk counter (again), Jason Wang, 2016/06/27
- [Qemu-devel] [PULL 5/5] vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU, Jason Wang, 2016/06/27
- Re: [Qemu-devel] [PULL 0/5] Net patches, Peter Maydell, 2016/06/28