diff options
| author | P J P <pjp@fedoraproject.org> | 2015-09-04 17:21:06 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-09-15 12:51:02 +0100 |
| commit | b947ac2bf26479e710489739c465c8af336599e7 (patch) | |
| tree | d6e12697f63a0254541157ece4a6064059d9cb5d /hw/net | |
| parent | 2752e5bedb26fa0c7291f810f9f534b688b2f1d2 (diff) | |
| download | qemu-b947ac2bf26479e710489739c465c8af336599e7.tar.gz qemu-b947ac2bf26479e710489739c465c8af336599e7.tar.bz2 qemu-b947ac2bf26479e710489739c465c8af336599e7.zip | |
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]
Signed-off-by: P J P <pjp@fedoraproject.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1441383666-6590-1-git-send-email-stefanha@redhat.com
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/e1000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 5c6bcd0014..09c9e9d53b 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -740,7 +740,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) memmove(tp->data, tp->header, tp->hdr_len); tp->size = tp->hdr_len; } - } 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 segmentation error\n"); |