[dpdk-stable] patch 'net/virtio: fix buffer leak on VLAN insert' has been queued to LTS release 18.11.2

[Kevin Traynor]

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 <stephen at networkplumber.org>
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 <stephen at networkplumber.org>
Reviewed-by: Jens Freimann <jfreimann at redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 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 at 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,