[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/24] net: rocker: fix an incorrect array bounds che
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 21/24] net: rocker: fix an incorrect array bounds check |
Date: |
Mon, 11 Jan 2016 13:31:12 +0800 |
From: Prasad J Pandit <address@hidden>
While processing transmit(tx) descriptors in 'tx_consume' routine
the switch emulator suffers from an off-by-one error, if a
descriptor was to have more than allowed(ROCKER_TX_FRAGS_MAX=16)
fragments. Fix an incorrect bounds check to avoid it.
Reported-by: Qinghao Tang <address@hidden>
Cc: address@hidden
Signed-off-by: Prasad J Pandit <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/rocker/rocker.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index c57f1a6..2e77e50 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -232,6 +232,9 @@ static int tx_consume(Rocker *r, DescInfo *info)
frag_addr = rocker_tlv_get_le64(tlvs[ROCKER_TLV_TX_FRAG_ATTR_ADDR]);
frag_len = rocker_tlv_get_le16(tlvs[ROCKER_TLV_TX_FRAG_ATTR_LEN]);
+ if (iovcnt >= ROCKER_TX_FRAGS_MAX) {
+ goto err_too_many_frags;
+ }
iov[iovcnt].iov_len = frag_len;
iov[iovcnt].iov_base = g_malloc(frag_len);
if (!iov[iovcnt].iov_base) {
@@ -244,10 +247,7 @@ static int tx_consume(Rocker *r, DescInfo *info)
err = -ROCKER_ENXIO;
goto err_bad_io;
}
-
- if (++iovcnt > ROCKER_TX_FRAGS_MAX) {
- goto err_too_many_frags;
- }
+ iovcnt++;
}
if (iovcnt) {
--
2.5.0
- [Qemu-devel] [PULL 11/24] net/vmxnet3: rename VMXNET3_DEVICE_VERSION to VMXNET3_UPT_REVISION, (continued)
- [Qemu-devel] [PULL 11/24] net/vmxnet3: rename VMXNET3_DEVICE_VERSION to VMXNET3_UPT_REVISION, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 12/24] net/dump: fix nfds->filename leak, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 13/24] net/filter: fix nf->netdev_id leak, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 14/24] vmxnet3: Change offsets of msi/msix pci capabilities, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 15/24] vmxnet3: Change the offset of the MSIX PBA table, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 16/24] vmxnet3: Introduce 'x-old-msi-offsets' back-compat property, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 17/24] vmxnet3: coding: Introduce VMXNET3Class, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 18/24] vmxnet3: The vmxnet3 device is a PCIE endpoint, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 19/24] vmxnet3: Report the Device Serial Number capability, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 20/24] vmxnet3: Introduce 'x-disable-pcie' back-compat property, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 21/24] net: rocker: fix an incorrect array bounds check,
Jason Wang <=
- [Qemu-devel] [PULL 23/24] l2tpv3: fix cookie decoding, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 22/24] net: ne2000: fix bounds check in ioport operations, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 24/24] ether/slirp: Avoid redefinition of the same constants, Jason Wang, 2016/01/11
- Re: [Qemu-devel] [PULL 00/24] Net patches, Peter Maydell, 2016/01/11