From 43e504942187f37736f9304f3dd134657cec7042 Mon Sep 17 00:00:00 2001 From: P J P Date: Tue, 15 Sep 2015 14:28:25 +0000 Subject: [PATCH] e1000: Avoid infinite loop in processing transmit descriptor (CVE-2015-6815) While processing transmit descriptors, it could lead to an infinite loop if 'bytes' was to become zero; Add a check to avoid it. [The guest can force 'bytes' to 0 by setting the hdr_len and mss descriptor fields to 0. --Stefan] upstream-commit-id: b947ac2bf26479e710489739c465c8af336599e7 Signed-off-by: P J P Signed-off-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-id: 1441383666-6590-1-git-send-email-stefanha@redhat.com Signed-off-by: Stefano Stabellini --- hw/e1000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/e1000.c b/hw/e1000.c index a5e67a881..808f9db7e 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -483,7 +483,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) memmove(tp->data, tp->header, hdr); tp->size = hdr; } - } while (split_size -= bytes); + split_size -= bytes; + } while (bytes && split_size); } else if (!tp->tse && tp->cptse) { // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentaion Error\n"); -- 2.39.5