[dpdk-stable] patch 'mempool/octeontx: fix error handling in initialization' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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 3f1a929aadc613921a352507ba54fc4eac4dbc4e Mon Sep 17 00:00:00 2001
From: Krzysztof Kanas <kkanas at marvell.com>
Date: Thu, 19 Dec 2019 11:44:34 +0100
Subject: [PATCH] mempool/octeontx: fix error handling in initialization

[ upstream commit 4f2c3c7b1da78bbb6270668e7a2b412863439b7f ]

When octeontx_get_fpavf fails fpa pointer is used to get
pool_stack_base, which is then freed.

Coverity issue: 351263
Fixes: 9bc692f83baa ("mempool/octeontx: add application domain validation")

Signed-off-by: Krzysztof Kanas <kkanas at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/mempool/octeontx/octeontx_fpavf.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c
index c97267db3c..63f8fb3b50 100644
--- a/drivers/mempool/octeontx/octeontx_fpavf.c
+++ b/drivers/mempool/octeontx/octeontx_fpavf.c
@@ -305,10 +305,8 @@ octeontx_fpapf_pool_destroy(unsigned int gpool_index)
 	int ret = -1;
 
 	fpa = octeontx_get_fpavf(gpool_index);
-	if (fpa == NULL) {
-		ret = -EINVAL;
-		goto err;
-	}
+	if (fpa == NULL)
+		return -EINVAL;
 
 	hdr.coproc = FPA_COPROC;
 	hdr.msg = FPA_CONFIGSET;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:41.928004926 +0000
+++ 0086-mempool-octeontx-fix-error-handling-in-initializatio.patch	2020-02-11 11:17:38.524003666 +0000
@@ -1,14 +1,15 @@
-From 4f2c3c7b1da78bbb6270668e7a2b412863439b7f Mon Sep 17 00:00:00 2001
+From 3f1a929aadc613921a352507ba54fc4eac4dbc4e Mon Sep 17 00:00:00 2001
 From: Krzysztof Kanas <kkanas at marvell.com>
 Date: Thu, 19 Dec 2019 11:44:34 +0100
 Subject: [PATCH] mempool/octeontx: fix error handling in initialization
 
+[ upstream commit 4f2c3c7b1da78bbb6270668e7a2b412863439b7f ]
+
 When octeontx_get_fpavf fails fpa pointer is used to get
 pool_stack_base, which is then freed.
 
 Coverity issue: 351263
 Fixes: 9bc692f83baa ("mempool/octeontx: add application domain validation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Krzysztof Kanas <kkanas at marvell.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>