63c3424617
openeuler !302!305 e1000-fail-early-for-evil-descriptor.patch e1000-fix-tx-re-entrancy-problem.patch hw-sd-sdcard-Restrict-Class-6-commands-to-SCSD-cards.patch hw-sd-sdcard-Simplify-realize-a-bit.patch hw-sd-sdcard-Do-not-allow-invalid-SD-card-sizes.patch hw-sd-sdcard-Update-coding-style-to-make-checkpatch..patch hw-sd-sdcard-Do-not-switch-to-ReceivingData-if-addre.patch scsi-qemu-pr-helper-Fix-out-of-bounds-access-to-trnp.patch curses-Fixes-curses-compiling-errors.patch net-dump.c-Suppress-spurious-compiler-warning.patch tests-Replace-deprecated-ASN1-code.patch
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From d9f04ba174842bfdbcdcec2c90a2a726b914b9fd Mon Sep 17 00:00:00 2001
|
|
From: Jason Wang <jasowang@redhat.com>
|
|
Date: Wed, 24 Feb 2021 13:45:28 +0800
|
|
Subject: [PATCH 1/7] e1000: fail early for evil descriptor
|
|
|
|
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 a99aa3ccc3..f0219d363c 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.17.1
|
|
|