From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mtsirkin@redhat.com>,
P J P <pjp@fedoraproject.org>, Jason Wang <jasowang@redhat.com>,
qemu-stable@nongnu.org, P J P <ppandit@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Huzaifa Sidhpurwala <huzaifas@redhat.com>
Subject: [Qemu-devel] [PATCH] e1000: Avoid infinite loop in processing transmit descriptor
Date: Fri, 4 Sep 2015 17:21:06 +0100 [thread overview]
Message-ID: <1441383666-6590-1-git-send-email-stefanha@redhat.com> (raw)
From: P J P <pjp@fedoraproject.org>
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>
---
hw/net/e1000.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 5c6bcd0..09c9e9d 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");
--
2.4.3
next reply other threads:[~2015-09-04 16:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-04 16:21 Stefan Hajnoczi [this message]
2015-09-07 9:04 ` [Qemu-devel] [PATCH] e1000: Avoid infinite loop in processing transmit descriptor Thomas Huth
2015-09-09 9:10 ` Stefan Hajnoczi
2015-09-09 9:10 ` Stefan Hajnoczi
2015-09-09 9:49 ` pjp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441383666-6590-1-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=huzaifas@redhat.com \
--cc=jasowang@redhat.com \
--cc=mtsirkin@redhat.com \
--cc=pjp@fedoraproject.org \
--cc=ppandit@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).