From nobody Fri Nov 14 03:46:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584611734; cv=none; d=zohomail.com; s=zohoarc; b=Qa6Vu7FFgCkm488soh28dUeuK40+3DMnw5segyU0VL0t2QSEPmGERviUpYuIDxFFQWT3AB1MqUoPfZSWhLL/7JS4OSdJylfe23xIMwsLqh+YQ5MHORas+gsEEDngaLrBjEFFKB0AKQ7rZktlAoAkxqSWp/UAd9xbpmWibuke6lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584611734; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AwME8ofdMlNyZiZXbkS1lNMvS2VzRBwAxzDX3MKKtIA=; b=B/y3wYC0l+o2HGSQiB2IMCt4r+TMt1LEMOJYSE+aCi+KHsT9M2PWIzib2N7KaN5ADJW5K7P7OJwASVOS0V7Kx//1AhYpPnXxnmi6aWSSBCffOZ2JdS9KKOnOt57W1gBruBzuxlkC+XafScMQPXqBE1pI2nB+Od18wae4sHjgwRw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584611734759383.3534037883619; Thu, 19 Mar 2020 02:55:34 -0700 (PDT) Received: from localhost ([::1]:35560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jErtl-0003BE-Ii for importer@patchew.org; Thu, 19 Mar 2020 05:55:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48528) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jErst-0001wG-Cn for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jErsr-0004v3-Uk for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:39 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:40670) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jErsr-0004uk-RY for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-5fEC_ERRMAubEns-HNFJWg-1; Thu, 19 Mar 2020 05:54:33 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6EB7A108443A; Thu, 19 Mar 2020 09:54:31 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 20439912AC; Thu, 19 Mar 2020 09:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584611677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AwME8ofdMlNyZiZXbkS1lNMvS2VzRBwAxzDX3MKKtIA=; b=DxbWYOnSHf0jgLJviuo1e6YbTbKrFPcK50htkksAfQzA25GQEpc7Y4QYWdQwe6qGEb9qEu bzBip5sZ+Gi7DHw/ZgwI8hoLCqjCOk773Z53l+yYquSXH0Py0Ift9tg+GWSFqRhdxhEF8c 88btC0KJQAh9mheie0opnxDLu7hLSf4= X-MC-Unique: 5fEC_ERRMAubEns-HNFJWg-1 From: P J P To: Jason Wang Subject: [PATCH v4 1/3] net: tulip: check frame size and r/w data length Date: Thu, 19 Mar 2020 15:22:09 +0530 Message-Id: <20200319095211.741445-2-ppandit@redhat.com> In-Reply-To: <20200319095211.741445-1-ppandit@redhat.com> References: <20200319095211.741445-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasad J Pandit , Stefan Hajnoczi , Qemu Developers , Li Qiang , Sven Schnelle , Ziming Zhang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit Tulip network driver while copying tx/rx buffers does not check frame size against r/w data length. This may lead to OOB buffer access. Add check to avoid it. Limit iterations over descriptors to avoid potential infinite loop issue in tulip_xmit_list_update. Reported-by: Li Qiang Reported-by: Ziming Zhang Reported-by: Jason Wang Signed-off-by: Prasad J Pandit --- hw/net/tulip.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) Update v3: return a value from tulip_copy_tx_buffers() and avoid infinite l= oop -> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg06275.html diff --git a/hw/net/tulip.c b/hw/net/tulip.c index cfac2719d3..fbe40095da 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -170,6 +170,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct = tulip_descriptor *desc) } else { len =3D s->rx_frame_len; } + + if (s->rx_frame_len + len >=3D sizeof(s->rx_frame)) { + return; + } pci_dma_write(&s->dev, desc->buf_addr1, s->rx_frame + (s->rx_frame_size - s->rx_frame_len), len); s->rx_frame_len -=3D len; @@ -181,6 +185,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct = tulip_descriptor *desc) } else { len =3D s->rx_frame_len; } + + if (s->rx_frame_len + len >=3D sizeof(s->rx_frame)) { + return; + } pci_dma_write(&s->dev, desc->buf_addr2, s->rx_frame + (s->rx_frame_size - s->rx_frame_len), len); s->rx_frame_len -=3D len; @@ -227,7 +235,8 @@ static ssize_t tulip_receive(TULIPState *s, const uint8= _t *buf, size_t size) =20 trace_tulip_receive(buf, size); =20 - if (size < 14 || size > 2048 || s->rx_frame_len || tulip_rx_stopped(s)= ) { + if (size < 14 || size > sizeof(s->rx_frame) - 4 + || s->rx_frame_len || tulip_rx_stopped(s)) { return 0; } =20 @@ -275,7 +284,6 @@ static ssize_t tulip_receive_nc(NetClientState *nc, return tulip_receive(qemu_get_nic_opaque(nc), buf, size); } =20 - static NetClientInfo net_tulip_info =3D { .type =3D NET_CLIENT_DRIVER_NIC, .size =3D sizeof(NICState), @@ -558,7 +566,7 @@ static void tulip_tx(TULIPState *s, struct tulip_descri= ptor *desc) if ((s->csr[6] >> CSR6_OM_SHIFT) & CSR6_OM_MASK) { /* Internal or external Loopback */ tulip_receive(s, s->tx_frame, s->tx_frame_len); - } else { + } else if (s->tx_frame_len <=3D sizeof(s->tx_frame)) { qemu_send_packet(qemu_get_queue(s->nic), s->tx_frame, s->tx_frame_len); } @@ -570,23 +578,31 @@ static void tulip_tx(TULIPState *s, struct tulip_desc= riptor *desc) } } =20 -static void tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *= desc) +static int tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *d= esc) { int len1 =3D (desc->control >> TDES1_BUF1_SIZE_SHIFT) & TDES1_BUF1_SIZ= E_MASK; int len2 =3D (desc->control >> TDES1_BUF2_SIZE_SHIFT) & TDES1_BUF2_SIZ= E_MASK; =20 + if (s->tx_frame_len + len1 >=3D sizeof(s->tx_frame)) { + return -1; + } if (len1) { pci_dma_read(&s->dev, desc->buf_addr1, s->tx_frame + s->tx_frame_len, len1); s->tx_frame_len +=3D len1; } =20 + if (s->tx_frame_len + len2 >=3D sizeof(s->tx_frame)) { + return -1; + } if (len2) { pci_dma_read(&s->dev, desc->buf_addr2, s->tx_frame + s->tx_frame_len, len2); s->tx_frame_len +=3D len2; } desc->status =3D (len1 + len2) ? 0 : 0x7fffffff; + + return 0; } =20 static void tulip_setup_filter_addr(TULIPState *s, uint8_t *buf, int n) @@ -651,13 +667,15 @@ static uint32_t tulip_ts(TULIPState *s) =20 static void tulip_xmit_list_update(TULIPState *s) { +#define TULIP_DESC_MAX 128 + uint8_t i =3D 0; struct tulip_descriptor desc; =20 if (tulip_ts(s) !=3D CSR5_TS_SUSPENDED) { return; } =20 - for (;;) { + for (i =3D 0; i < TULIP_DESC_MAX; i++) { tulip_desc_read(s, s->current_tx_desc, &desc); tulip_dump_tx_descriptor(s, &desc); =20 @@ -675,10 +693,10 @@ static void tulip_xmit_list_update(TULIPState *s) s->tx_frame_len =3D 0; } =20 - tulip_copy_tx_buffers(s, &desc); - - if (desc.control & TDES1_LS) { - tulip_tx(s, &desc); + if (!tulip_copy_tx_buffers(s, &desc)) { + if (desc.control & TDES1_LS) { + tulip_tx(s, &desc); + } } } tulip_desc_write(s, s->current_tx_desc, &desc); --=20 2.25.1 From nobody Fri Nov 14 03:46:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584611802; cv=none; d=zohomail.com; s=zohoarc; b=Qok0wTIu6xGV8qCGvEBUdmdA21pEDrMWMbNRvZeudt609RuH6EpcyOrNz+bcnd8vQG521CSlr1zMpgXepDnM+x3gnD9tnSF5qE4t00DRSwDXPRZifOvY5psWfsHgaX1HB4sHE4X52hDnNwlMuVmB2pka2U5qNVwAR8N8jxEdJAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584611802; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oWalXXmn26iGgFC74sio3AVYyqrGlSDZ9Ww7DRhuHRY=; b=ENk+MqoBJKgh3H8TyEOr9Ygb7v15kJ0kMATfBu/uustomYa5KfY5gzrjOCkzDO8U0Ph3tKQsXeGHEiDKVbKBETM7gJYVSR3Izua4IOMwHS6ea9b5AjRzsRgH2G8BIPA4lXDvxYwOJhdUm8tpSypcB2voDemMYtTK1KRqijrm2Gk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584611802717446.2401572821731; Thu, 19 Mar 2020 02:56:42 -0700 (PDT) Received: from localhost ([::1]:35576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jErur-0004zI-DI for importer@patchew.org; Thu, 19 Mar 2020 05:56:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48606) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jErt4-0002GD-BD for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jErt3-0005AV-5t for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:50 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:49811) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jErt3-0005AI-24 for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:49 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-471-7rBeyPwrO0u-Z_xV_ZV0lw-1; Thu, 19 Mar 2020 05:54:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1FB1E8010EC; Thu, 19 Mar 2020 09:54:43 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C28A912BF; Thu, 19 Mar 2020 09:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584611688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oWalXXmn26iGgFC74sio3AVYyqrGlSDZ9Ww7DRhuHRY=; b=hXCbAVLw7LXwMBOeKDZBJkySjDsOPMTKHn0LxARO1APKkVQMd0egbUtOwCm0FnpVAzuCY1 mSt7X90so2ywmSeXt3/yZ1Ky+mGNgapoLvSyBYofx+IMAszMBLpn6pm7+9TVuUN5Jjj6wE vlsb+2EPdwYAV+IsdeBDt3dzPLykQyk= X-MC-Unique: 7rBeyPwrO0u-Z_xV_ZV0lw-1 From: P J P To: Jason Wang Subject: [PATCH v4 2/3] net: tulip: add .can_recieve routine Date: Thu, 19 Mar 2020 15:22:10 +0530 Message-Id: <20200319095211.741445-3-ppandit@redhat.com> In-Reply-To: <20200319095211.741445-1-ppandit@redhat.com> References: <20200319095211.741445-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasad J Pandit , Stefan Hajnoczi , Qemu Developers , Li Qiang , Sven Schnelle , Ziming Zhang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit Define .can_receive routine to do sanity checks before receiving packet data. Signed-off-by: Prasad J Pandit --- hw/net/tulip.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) Update v3: define .can_receive routine -> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg06275.html diff --git a/hw/net/tulip.c b/hw/net/tulip.c index fbe40095da..757f12c710 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -229,6 +229,18 @@ static bool tulip_filter_address(TULIPState *s, const = uint8_t *addr) return ret; } =20 +static int +tulip_can_receive(NetClientState *nc) +{ + TULIPState *s =3D qemu_get_nic_opaque(nc); + + if (s->rx_frame_len || tulip_rx_stopped(s)) { + return false; + } + + return true; +} + static ssize_t tulip_receive(TULIPState *s, const uint8_t *buf, size_t siz= e) { struct tulip_descriptor desc; @@ -236,7 +248,7 @@ static ssize_t tulip_receive(TULIPState *s, const uint8= _t *buf, size_t size) trace_tulip_receive(buf, size); =20 if (size < 14 || size > sizeof(s->rx_frame) - 4 - || s->rx_frame_len || tulip_rx_stopped(s)) { + || !tulip_can_receive(s->nic->ncs)) { return 0; } =20 @@ -288,6 +300,7 @@ static NetClientInfo net_tulip_info =3D { .type =3D NET_CLIENT_DRIVER_NIC, .size =3D sizeof(NICState), .receive =3D tulip_receive_nc, + .can_receive =3D tulip_can_receive, }; =20 static const char *tulip_reg_name(const hwaddr addr) --=20 2.25.1 From nobody Fri Nov 14 03:46:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584611755; cv=none; d=zohomail.com; s=zohoarc; b=oGq+UQyIt9DHi4IsvEe6boAMfaeo8aXKrIIrdHerhpLkQEbDkuhWieY7l5kanSnTCLdM7oy45dcnhud87VJw3u2BBY2FeMmbzd4HFV6X40LGaOpTpCXXNAOcotURC9pGuuSwljixJHabh8w8YgZ2b3v4kabEXY/q8PASkOvkXfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584611755; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HgQ7hSPoIbjC41jhR4qXZ4pIN0aN9ahfStvF6YdUm/8=; b=nPvG+X0yqKXWiGYrC6lFoQMPHrb3grm+sS7SsGj5QsKLmN6X/TZ4Y0ccqXGjCZ45VT6cGaCE+9c04qlZRhFkP4L43WhSLLRMqsJI7lmrfvdkFsNUJ5UuADXkE/q1YhJeoQpg8iu4ESoP2wdy6MhXcNRMLfKi9eM6qyZYyVtN0Sg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584611755284461.42011202762615; Thu, 19 Mar 2020 02:55:55 -0700 (PDT) Received: from localhost ([::1]:35566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEru6-0003pt-0m for importer@patchew.org; Thu, 19 Mar 2020 05:55:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48677) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jErtA-0002VK-AA for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jErt9-0005JK-6O for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:56 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:28467) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jErt9-0005IZ-2F for qemu-devel@nongnu.org; Thu, 19 Mar 2020 05:54:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-380-ZOFvtklOMGKqewjWh1m4lw-1; Thu, 19 Mar 2020 05:54:52 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49DC318C35CE; Thu, 19 Mar 2020 09:54:51 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ED9A69B901; Thu, 19 Mar 2020 09:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584611694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HgQ7hSPoIbjC41jhR4qXZ4pIN0aN9ahfStvF6YdUm/8=; b=Y3fF04vkDv/nPDCnqtjshE3xV5a5SuZH9aRTIzxxqXADfTiy1flhRXn/sRYIeCZbkOvJvG w4TpWAtNSCzSbrzPDs/ji90kqKzr/ToJjFGWXZdkP4cKHsQJ2pR/H6isKe4i6Eb6tyNo0b 4MO2orur5a3zvh4skDf8hrgwNrJ8zFA= X-MC-Unique: ZOFvtklOMGKqewjWh1m4lw-1 From: P J P To: Jason Wang Subject: [PATCH v4 3/3] net: tulip: flush queued packets post receive Date: Thu, 19 Mar 2020 15:22:11 +0530 Message-Id: <20200319095211.741445-4-ppandit@redhat.com> In-Reply-To: <20200319095211.741445-1-ppandit@redhat.com> References: <20200319095211.741445-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasad J Pandit , Stefan Hajnoczi , Qemu Developers , Li Qiang , Sven Schnelle , Ziming Zhang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit Call qemu_flush_queued_packets to flush queued packets once they are read in tulip_receive(). Suggested-by: Jason Wang Signed-off-by: Prasad J Pandit --- hw/net/tulip.c | 2 ++ 1 file changed, 2 insertions(+) Update v4: call qemu_flush_queued_packets() -> https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg05868.html diff --git a/hw/net/tulip.c b/hw/net/tulip.c index 757f12c710..8d8c9519e7 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -287,6 +287,8 @@ static ssize_t tulip_receive(TULIPState *s, const uint8= _t *buf, size_t size) tulip_desc_write(s, s->current_rx_desc, &desc); tulip_next_rx_descriptor(s, &desc); } while (s->rx_frame_len); + + qemu_flush_queued_packets(qemu_get_queue(s->nic)); return size; } =20 --=20 2.25.1