[dpdk-stable] patch 'net/af_packet: fix memory leak on init failure' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

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/02/20. 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/055c2e6d1ad7da31e45e451204631652de5c7cf6

Thanks.

Kevin.

---
>From 055c2e6d1ad7da31e45e451204631652de5c7cf6 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Mon, 6 Jul 2020 20:27:51 +0800
Subject: [PATCH] net/af_packet: fix memory leak on init failure

[ upstream commit 3400148949ea4edecba0256f4ab97e80f1d98474 ]

Add missing code to free memory when the device initialization fails.

Fixes: ccd37d341e8d ("net/af_packet: remove queue number limitation")
Fixes: 5f19dee604ed ("drivers/net: do not use private ethdev data")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/af_packet/rte_eth_af_packet.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 698197b552..bcbffe4caa 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -608,5 +608,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 			"%s: I/F name too long (%s)",
 			name, pair->value);
-		return -1;
+		goto free_internals;
 	}
 	if (ioctl(sockfd, SIOCGIFINDEX, &ifr) == -1) {
@@ -614,9 +614,9 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 			"%s: ioctl failed (SIOCGIFINDEX)",
 		        name);
-		return -1;
+		goto free_internals;
 	}
 	(*internals)->if_name = strdup(pair->value);
 	if ((*internals)->if_name == NULL)
-		return -1;
+		goto free_internals;
 	(*internals)->if_index = ifr.ifr_ifindex;
 
@@ -625,5 +625,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 			"%s: ioctl failed (SIOCGIFHWADDR)",
 		        name);
-		return -1;
+		goto free_internals;
 	}
 	memcpy(&(*internals)->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
@@ -649,5 +649,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 				"%s: could not open AF_PACKET socket",
 			        name);
-			return -1;
+			goto error;
 		}
 
@@ -802,4 +802,7 @@ error:
 			close((*internals)->rx_queue[q].sockfd);
 	}
+free_internals:
+	rte_free((*internals)->rx_queue);
+	rte_free((*internals)->tx_queue);
 	free((*internals)->if_name);
 	rte_free(*internals);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.052742747 +0100
+++ 0003-net-af_packet-fix-memory-leak-on-init-failure.patch	2020-08-28 11:03:25.895955246 +0100
@@ -1 +1 @@
-From 3400148949ea4edecba0256f4ab97e80f1d98474 Mon Sep 17 00:00:00 2001
+From 055c2e6d1ad7da31e45e451204631652de5c7cf6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3400148949ea4edecba0256f4ab97e80f1d98474 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- drivers/net/af_packet/rte_eth_af_packet.c | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
+ drivers/net/af_packet/rte_eth_af_packet.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
@@ -19 +20 @@
-index db5de8e45e..62945fee20 100644
+index 698197b552..bcbffe4caa 100644
@@ -22,10 +23 @@
-@@ -638,7 +638,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
- 						0, numa_node);
- 	if (!(*internals)->rx_queue || !(*internals)->tx_queue) {
--		rte_free((*internals)->rx_queue);
--		rte_free((*internals)->tx_queue);
--		return -1;
-+		goto free_internals;
- 	}
- 
-@@ -665,18 +663,18 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -608,5 +608,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
@@ -38 +30,3 @@
- 		PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFINDEX)", name);
+@@ -614,9 +614,9 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+ 			"%s: ioctl failed (SIOCGIFINDEX)",
+ 		        name);
@@ -48,2 +42,3 @@
- 	if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) == -1) {
- 		PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFHWADDR)", name);
+@@ -625,5 +625,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+ 			"%s: ioctl failed (SIOCGIFHWADDR)",
+ 		        name);
@@ -54 +49 @@
-@@ -702,5 +700,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -649,5 +649,5 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
@@ -56 +51 @@
- 				name);
+ 			        name);
@@ -61 +56 @@
-@@ -855,4 +853,7 @@ error:
+@@ -802,4 +802,7 @@ error: