From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzDtT-0000Zk-By for qemu-devel@nongnu.org; Tue, 25 Oct 2016 22:24:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzDtR-0000eT-RX for qemu-devel@nongnu.org; Tue, 25 Oct 2016 22:24:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50884) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzDtR-0000eO-Mb for qemu-devel@nongnu.org; Tue, 25 Oct 2016 22:24:41 -0400 From: Jason Wang Date: Wed, 26 Oct 2016 10:24:10 +0800 Message-Id: <1477448651-4474-9-git-send-email-jasowang@redhat.com> In-Reply-To: <1477448651-4474-1-git-send-email-jasowang@redhat.com> References: <1477448651-4474-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 8/9] net: rtl8139: limit processing of ring descriptors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Prasad J Pandit , Jason Wang From: Prasad J Pandit 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 Signed-off-by: Prasad J Pandit Signed-off-by: Jason Wang --- 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