patch 'net/bnxt: fix null dereference in session cleanup' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/cfd9d0902d95112a2b9c18edc5382eca5f34e745

Thanks.

Luca Boccassi

---
>From cfd9d0902d95112a2b9c18edc5382eca5f34e745 Mon Sep 17 00:00:00 2001
From: Weiguo Li <liwg06 at foxmail.com>
Date: Thu, 24 Feb 2022 23:53:59 +0800
Subject: [PATCH] net/bnxt: fix null dereference in session cleanup

[ upstream commit a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6 ]

In tf_session_create(), there is a case that with 'tfp->session' still
be NULL and run 'goto cleanup', which will leads to a null dereference
by 'tfp_free(tfp->session->core_data)' in the cleanup.

Fixes: a46bbb57605b ("net/bnxt: update multi device design")

Signed-off-by: Weiguo Li <liwg06 at foxmail.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/tf_core/tf_session.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bnxt/tf_core/tf_session.c b/drivers/net/bnxt/tf_core/tf_session.c
index c95c4bdbd3..598338d46c 100644
--- a/drivers/net/bnxt/tf_core/tf_session.c
+++ b/drivers/net/bnxt/tf_core/tf_session.c
@@ -182,9 +182,12 @@ tf_session_create(struct tf *tfp,
 	return 0;
 
  cleanup:
-	tfp_free(tfp->session->core_data);
-	tfp_free(tfp->session);
-	tfp->session = NULL;
+	if (tfp->session) {
+		tfp_free(tfp->session->core_data);
+		tfp_free(tfp->session);
+		tfp->session = NULL;
+	}
+
 	return rc;
 }
 
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-09 16:30:09.544325884 +0000
+++ 0028-net-bnxt-fix-null-dereference-in-session-cleanup.patch	2022-03-09 16:30:08.559025422 +0000
@@ -1 +1 @@
-From a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6 Mon Sep 17 00:00:00 2001
+From cfd9d0902d95112a2b9c18edc5382eca5f34e745 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -16,2 +17,2 @@
- drivers/net/bnxt/tf_core/tf_session.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ drivers/net/bnxt/tf_core/tf_session.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
@@ -20 +21 @@
-index 9f849a0a76..c30c0e7029 100644
+index c95c4bdbd3..598338d46c 100644
@@ -23,4 +24,7 @@
-@@ -230,10 +230,12 @@ tf_session_create(struct tf *tfp,
- 			    "FW Session close failed, rc:%s\n",
- 			    strerror(-rc));
- 	}
+@@ -182,9 +182,12 @@ tf_session_create(struct tf *tfp,
+ 	return 0;
+ 
+  cleanup:
+-	tfp_free(tfp->session->core_data);
+-	tfp_free(tfp->session);
+-	tfp->session = NULL;
@@ -32,4 +36 @@
- 
--	tfp_free(tfp->session->core_data);
--	tfp_free(tfp->session);
--	tfp->session = NULL;
++