From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 173FEA0096 for ; Wed, 8 May 2019 12:16:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BF642862; Wed, 8 May 2019 12:16:17 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8DE702862 for ; Wed, 8 May 2019 12:16:15 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF21CC06645C; Wed, 8 May 2019 10:16:14 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 124051A267; Wed, 8 May 2019 10:16:10 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Jens Freimann , Maxime Coquelin , dpdk stable Date: Wed, 8 May 2019 11:14:56 +0100 Message-Id: <20190508101534.8984-14-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 08 May 2019 10:16:15 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: fix buffer leak on VLAN insert' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/13/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/719c8cc68f4d9abaea6e55f1e652353a42eaa108 Thanks. Kevin Traynor --- >From 719c8cc68f4d9abaea6e55f1e652353a42eaa108 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 5 Apr 2019 09:31:15 -0700 Subject: [PATCH] net/virtio: fix buffer leak on VLAN insert [ upstream commit 8f37e38241f291f2ae8fa7e8d0d4ec3eae50b2de ] The function rte_vlan_insert may allocate a new buffer for the vlan header and return a different mbuf than originally passed. In this case, the stored mbuf in txm[] array could point to wrong buffer. Fixes: dd856dfcb9e7 ("virtio: use any layout on Tx") Signed-off-by: Stephen Hemminger Reviewed-by: Jens Freimann Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 66b2f9f35..7f7562ddc 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -1375,4 +1375,6 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) continue; } + /* vlan_insert may add a header mbuf */ + tx_pkts[nb_tx] = txm; } @@ -1479,4 +1481,6 @@ virtio_xmit_pkts_inorder(void *tx_queue, continue; } + /* vlan_insert may add a header mbuf */ + tx_pkts[nb_tx] = txm; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:06.570015938 +0100 +++ 0014-net-virtio-fix-buffer-leak-on-VLAN-insert.patch 2019-05-08 11:05:05.789933598 +0100 @@ -1 +1 @@ -From 8f37e38241f291f2ae8fa7e8d0d4ec3eae50b2de Mon Sep 17 00:00:00 2001 +From 719c8cc68f4d9abaea6e55f1e652353a42eaa108 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f37e38241f291f2ae8fa7e8d0d4ec3eae50b2de ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - drivers/net/virtio/virtio_rxtx.c | 6 ++++++ - 1 file changed, 6 insertions(+) + drivers/net/virtio/virtio_rxtx.c | 4 ++++ + 1 file changed, 4 insertions(+) @@ -22 +23 @@ -index e6f3706d6..8c56f238f 100644 +index 66b2f9f35..7f7562ddc 100644 @@ -25,8 +26 @@ -@@ -2004,4 +2004,6 @@ virtio_xmit_pkts_packed(void *tx_queue, struct rte_mbuf **tx_pkts, - continue; - } -+ /* vlan_insert may add a header mbuf */ -+ tx_pkts[nb_tx] = txm; - } - -@@ -2091,4 +2093,6 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -1375,4 +1375,6 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -39 +33 @@ -@@ -2194,4 +2198,6 @@ virtio_xmit_pkts_inorder(void *tx_queue, +@@ -1479,4 +1481,6 @@ virtio_xmit_pkts_inorder(void *tx_queue,