[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/16] e1000: fail early for evil descriptor
From: |
Jason Wang |
Subject: |
[PULL 05/16] e1000: fail early for evil descriptor |
Date: |
Fri, 12 Mar 2021 14:16:15 +0800 |
During procss_tx_desc(), driver can try to chain data descriptor with
legacy descriptor, when will lead underflow for the following
calculation in process_tx_desc() for bytes:
if (tp->size + bytes > msh)
bytes = msh - tp->size;
This will lead a infinite loop. So check and fail early if tp->size if
greater or equal to msh.
Reported-by: Alexander Bulekov <alxndr@bu.edu>
Reported-by: Cheolwoo Myung <cwmyung@snu.ac.kr>
Reported-by: Ruhr-University Bochum <bugs-syssec@rub.de>
Cc: Prasad J Pandit <ppandit@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/e1000.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index d8da2f6..4345d86 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -670,6 +670,9 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
msh = tp->tso_props.hdr_len + tp->tso_props.mss;
do {
bytes = split_size;
+ if (tp->size >= msh) {
+ goto eop;
+ }
if (tp->size + bytes > msh)
bytes = msh - tp->size;
@@ -695,6 +698,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
tp->size += split_size;
}
+eop:
if (!(txd_lower & E1000_TXD_CMD_EOP))
return;
if (!(tp->cptse && tp->size < tp->tso_props.hdr_len)) {
--
2.7.4
- [PULL 00/16] Net patches, Jason Wang, 2021/03/12
- [PULL 01/16] virtio-net: calculating proper msix vectors on init, Jason Wang, 2021/03/12
- [PULL 02/16] net: Fix build error when DEBUG_NET is on, Jason Wang, 2021/03/12
- [PULL 03/16] net: validate that ids are well formed, Jason Wang, 2021/03/12
- [PULL 04/16] net: unbreak well-form id check for "-nic", Jason Wang, 2021/03/12
- [PULL 06/16] net: introduce qemu_receive_packet(), Jason Wang, 2021/03/12
- [PULL 05/16] e1000: fail early for evil descriptor,
Jason Wang <=
- [PULL 07/16] e1000: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 08/16] dp8393x: switch to use qemu_receive_packet() for loopback packet, Jason Wang, 2021/03/12
- [PULL 09/16] msf2-mac: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 10/16] sungem: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 11/16] tx_pkt: switch to use qemu_receive_packet_iov() for loopback, Jason Wang, 2021/03/12
- [PULL 12/16] rtl8139: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 13/16] pcnet: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 14/16] cadence_gem: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 15/16] lan9118: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 16/16] pvrdma: wean code off pvrdma_ring.h kernel header, Jason Wang, 2021/03/12