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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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

Thanks.

Luca Boccassi

---
>From 8298ac40093e6b800d4715da73cf4d2d44090f0f 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 6c6bbaccf..841a7009a 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -623,20 +623,20 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 		PMD_LOG(ERR,
 			"%s: I/F name too long (%s)",
 			name, pair->value);
-		return -1;
+		goto free_internals;
 	}
 	if (ioctl(sockfd, SIOCGIFINDEX, &ifr) == -1) {
 		PMD_LOG_ERRNO(ERR, "%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;
 
 	if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) == -1) {
 		PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFHWADDR)", name);
-		return -1;
+		goto free_internals;
 	}
 	memcpy(&(*internals)->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
 
@@ -660,7 +660,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 			PMD_LOG_ERRNO(ERR,
 				"%s: could not open AF_PACKET socket",
 				name);
-			return -1;
+			goto error;
 		}
 
 		tpver = TPACKET_V2;
@@ -813,6 +813,9 @@ error:
 			((*internals)->rx_queue[q].sockfd != qsockfd))
 			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);
 	return -1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:54.572131535 +0100
+++ 0156-net-af_packet-fix-memory-leak-on-init-failure.patch	2020-07-24 12:53:48.519010782 +0100
@@ -1,36 +1,26 @@
-From 3400148949ea4edecba0256f4ab97e80f1d98474 Mon Sep 17 00:00:00 2001
+From 8298ac40093e6b800d4715da73cf4d2d44090f0f 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")
-Cc: stable at dpdk.org
 
 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 | 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(-)
 
 diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
-index db5de8e45..62945fee2 100644
+index 6c6bbaccf..841a7009a 100644
 --- a/drivers/net/af_packet/rte_eth_af_packet.c
 +++ b/drivers/net/af_packet/rte_eth_af_packet.c
-@@ -637,9 +637,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
- 						sizeof(struct pkt_tx_queue),
- 						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;
- 	}
- 
- 	for (q = 0; q < nb_queues; q++) {
-@@ -664,20 +662,20 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -623,20 +623,20 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
  		PMD_LOG(ERR,
  			"%s: I/F name too long (%s)",
  			name, pair->value);
@@ -55,7 +45,7 @@
  	}
  	memcpy(&(*internals)->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
  
-@@ -701,7 +699,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -660,7 +660,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
  			PMD_LOG_ERRNO(ERR,
  				"%s: could not open AF_PACKET socket",
  				name);
@@ -64,7 +54,7 @@
  		}
  
  		tpver = TPACKET_V2;
-@@ -854,6 +852,9 @@ error:
+@@ -813,6 +813,9 @@ error:
  			((*internals)->rx_queue[q].sockfd != qsockfd))
  			close((*internals)->rx_queue[q].sockfd);
  	}