]> git.proxmox.com Git - mirror_qemu.git/commitdiff
net: rtl8139: limit processing of ring descriptors
authorPrasad J Pandit <pjp@fedoraproject.org>
Fri, 21 Oct 2016 12:09:29 +0000 (17:39 +0530)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 2 Nov 2016 23:19:01 +0000 (18:19 -0500)
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>
(cherry picked from commit c7c35916692fe010fef25ac338443d3fe40be225)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/net/rtl8139.c

index 3345bc6b5eb35040a6838e336005f6b545318e33..f05e59c85f38ef3023184af39bced16694b76714 100644 (file)
@@ -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;
     }