From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: Prasad J Pandit <pjp@fedoraproject.org>,
Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 8/9] net: rtl8139: limit processing of ring descriptors
Date: Wed, 26 Oct 2016 10:24:10 +0800 [thread overview]
Message-ID: <1477448651-4474-9-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1477448651-4474-1-git-send-email-jasowang@redhat.com>
From: Prasad J Pandit <pjp@fedoraproject.org>
RTL8139 ethernet controller in C+ mode supports multiple
descriptor rings, each with maximum of 64 descriptors. While
processing transmit descriptor ring in 'rtl8139_cplus_transmit',
it does not limit the descriptor count and runs forever. Add
check to avoid it.
Reported-by: Andrew Henderson <hendersa@icculus.org>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/rtl8139.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 3345bc6..f05e59c 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -2350,7 +2350,7 @@ static void rtl8139_cplus_transmit(RTL8139State *s)
{
int txcount = 0;
- while (rtl8139_cplus_transmit_one(s))
+ while (txcount < 64 && rtl8139_cplus_transmit_one(s))
{
++txcount;
}
--
2.7.4
next prev parent reply other threads:[~2016-10-26 2:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-26 2:24 [Qemu-devel] [PULL 0/9] Net patches Jason Wang
2016-10-26 2:24 ` [Qemu-devel] [PULL 1/9] net: pcnet: check rx/tx descriptor ring length Jason Wang
2016-10-26 2:24 ` [Qemu-devel] [PULL 2/9] net: pcnet: fix source formatting and indentation Jason Wang
2016-10-26 2:24 ` [Qemu-devel] [PULL 3/9] tap-bsd: OpenBSD uses tap(4) now Jason Wang
2016-10-26 2:24 ` [Qemu-devel] [PULL 4/9] net: eepro100: fix memory leak in device uninit Jason Wang
2016-10-26 2:24 ` [Qemu-devel] [PULL 5/9] net: rocker: set limit to DMA buffer size Jason Wang
2016-10-26 2:24 ` [Qemu-devel] [PULL 6/9] e1000e: Don't zero out buffer address in rx descriptor Jason Wang
2016-10-26 2:24 ` [Qemu-devel] [PULL 7/9] net: vmxnet: initialise local tx descriptor Jason Wang
2016-10-26 2:24 ` Jason Wang [this message]
2016-10-26 2:24 ` [Qemu-devel] [PULL 9/9] colo-proxy: fix memory leak Jason Wang
2016-10-30 12:13 ` Greg Kurz
2016-10-31 6:37 ` Zhang Chen
2016-10-31 7:40 ` Jason Wang
2016-10-31 8:05 ` Zhang Chen
2016-10-31 9:30 ` Greg Kurz
2016-10-27 12:31 ` [Qemu-devel] [PULL 0/9] Net patches Peter Maydell
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=1477448651-4474-9-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=pjp@fedoraproject.org \
--cc=qemu-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.