From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60413)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1byYzE-0002D5-Nk
	for qemu-devel@nongnu.org; Mon, 24 Oct 2016 02:43:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jasowang@redhat.com>) id 1byYzA-00006l-KZ
	for qemu-devel@nongnu.org; Mon, 24 Oct 2016 02:43:56 -0400
Received: from mx1.redhat.com ([209.132.183.28]:33004)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jasowang@redhat.com>) id 1byYzA-00005c-FC
	for qemu-devel@nongnu.org; Mon, 24 Oct 2016 02:43:52 -0400
References: <1477051769-4891-1-git-send-email-ppandit@redhat.com>
From: Jason Wang <jasowang@redhat.com>
Message-ID: <7b491ddb-495a-1a85-fd67-2ccb7752891e@redhat.com>
Date: Mon, 24 Oct 2016 14:43:44 +0800
MIME-Version: 1.0
In-Reply-To: <1477051769-4891-1-git-send-email-ppandit@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] net: rtl8139: limit processing of ring
 descriptors
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: P J P <ppandit@redhat.com>, Qemu Developers <qemu-devel@nongnu.org>
Cc: Andrew Henderson <hendersa@icculus.org>, Prasad J Pandit <pjp@fedoraproject.org>



On 2016=E5=B9=B410=E6=9C=8821=E6=97=A5 20:09, P J P wrote:
> 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>
> ---
>   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 =3D 0;
>  =20
> -    while (rtl8139_cplus_transmit_one(s))
> +    while (txcount < 64 && rtl8139_cplus_transmit_one(s))
>       {
>           ++txcount;
>       }

Applied to -net, thanks.