[dpdk-stable] patch 'net/thunderx: fix memory leak on rbdr desc ring failure' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

Thanks.

Kevin.

---
>From 4a730b3da651720402a413072f48d258047ae177 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Tue, 20 Oct 2020 23:02:37 +0800
Subject: [PATCH] net/thunderx: fix memory leak on rbdr desc ring failure

[ upstream commit 33d1405fc3264200d762c08728f4155335799456 ]

In nicvf_qset_rbdr_alloc(), we allocate memory for the 'rbdr'
structure but not released when allocate 'rbdr desc ring' fails.

Fixes: 7413feee662d ("net/thunderx: add device start/stop and close")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/thunderx/nicvf_ethdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c
index d627a3bb70..a47a287a5f 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -646,4 +646,5 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic,
 	if (rz == NULL) {
 		PMD_INIT_LOG(ERR, "Failed to allocate mem for rbdr desc ring");
+		rte_free(rbdr);
 		return -ENOMEM;
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:39.189807742 +0000
+++ 0067-net-thunderx-fix-memory-leak-on-rbdr-desc-ring-failu.patch	2020-11-18 16:33:37.994215104 +0000
@@ -1 +1 @@
-From 33d1405fc3264200d762c08728f4155335799456 Mon Sep 17 00:00:00 2001
+From 4a730b3da651720402a413072f48d258047ae177 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 33d1405fc3264200d762c08728f4155335799456 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index f0bd20a22b..b6bb05e500 100644
+index d627a3bb70..a47a287a5f 100644
@@ -22 +23 @@
-@@ -639,4 +639,5 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic,
+@@ -646,4 +646,5 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic,