[dpdk-stable] patch 'net/pcap: fix possible mbuf double freeing' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/04/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/27c4b1fbef2e8eb46206b1ad76bf310d586f156e

Thanks.

Kevin Traynor

---
From 27c4b1fbef2e8eb46206b1ad76bf310d586f156e Mon Sep 17 00:00:00 2001
From: Aideen McLoughlin <aideen.mcloughlin@intel.com>
Date: Thu, 11 Jul 2019 14:59:46 +0100
Subject: [PATCH] net/pcap: fix possible mbuf double freeing

[ upstream commit 49a0a2ffd5db85f7bcc1de37391272f859aabbd4 ]

In the eth_pcap_tx() and eth_pcap_tx_dumper() functions mbufs were freed
without incrementing num_tx.
This may lead application also try to free or use invalid mbuf.

To fix the issue, the mbuf freeing was removed.

Fixes: 6db141c91e1f ("pcap: support jumbo frames")

Signed-off-by: Aideen McLoughlin <aideen.mcloughlin@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/pcap/rte_eth_pcap.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index ccf07d433..070124c86 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -298,5 +298,4 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 					ETHER_MAX_JUMBO_FRAME_LEN);
 
-				rte_pktmbuf_free(mbuf);
 				break;
 			}
@@ -360,5 +359,4 @@ eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 					ETHER_MAX_JUMBO_FRAME_LEN);
 
-				rte_pktmbuf_free(mbuf);
 				break;
 			}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:32.909636600 +0100
+++ 0020-net-pcap-fix-possible-mbuf-double-freeing.patch	2019-08-28 14:32:31.627957672 +0100
@@ -1 +1 @@
-From 49a0a2ffd5db85f7bcc1de37391272f859aabbd4 Mon Sep 17 00:00:00 2001
+From 27c4b1fbef2e8eb46206b1ad76bf310d586f156e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 49a0a2ffd5db85f7bcc1de37391272f859aabbd4 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 7ff6dc38d..d1dca2a38 100644
+index ccf07d433..070124c86 100644
@@ -25,2 +26,2 @@
-@@ -350,5 +350,4 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
- 					RTE_ETHER_MAX_JUMBO_FRAME_LEN);
+@@ -298,5 +298,4 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+ 					ETHER_MAX_JUMBO_FRAME_LEN);
@@ -31,2 +32,2 @@
-@@ -436,5 +435,4 @@ eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
- 					RTE_ETHER_MAX_JUMBO_FRAME_LEN);
+@@ -360,5 +359,4 @@ eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+ 					ETHER_MAX_JUMBO_FRAME_LEN);