[dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 ef6d112d7d5eec99030464e162f8b21428454403 Mon Sep 17 00:00:00 2001
From: Apeksha Gupta <apeksha.gupta at nxp.com>
Date: Fri, 8 May 2020 18:32:02 +0530
Subject: [PATCH] bus/fslmc: fix dereferencing null pointer

[ upstream commit 27ede02945b31e952a66c1bdbf7cf9481698d8dd ]

Fixes: 6fef517e17cf ("bus/fslmc: add qman HW fq query count API")

Signed-off-by: Apeksha Gupta <apeksha.gupta at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/bus/fslmc/qbman/qbman_debug.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c b/drivers/bus/fslmc/qbman/qbman_debug.c
index 0bb2ce880f..4cd0923acb 100644
--- a/drivers/bus/fslmc/qbman/qbman_debug.c
+++ b/drivers/bus/fslmc/qbman/qbman_debug.c
@@ -27,19 +27,20 @@ int qbman_fq_query_state(struct qbman_swp *s, uint32_t fqid,
 			 struct qbman_fq_query_np_rslt *r)
 {
 	struct qbman_fq_query_desc *p;
+	struct qbman_fq_query_np_rslt *var;
 
 	p = (struct qbman_fq_query_desc *)qbman_swp_mc_start(s);
 	if (!p)
 		return -EBUSY;
 
 	p->fqid = fqid;
-	*r = *(struct qbman_fq_query_np_rslt *)qbman_swp_mc_complete(s, p,
-						QBMAN_FQ_QUERY_NP);
-	if (!r) {
+	var = qbman_swp_mc_complete(s, p, QBMAN_FQ_QUERY_NP);
+	if (!var) {
 		pr_err("qbman: Query FQID %d NP fields failed, no response\n",
 		       fqid);
 		return -EIO;
 	}
+	*r = *var;
 
 	/* Decode the outcome */
 	QBMAN_BUG_ON((r->verb & QBMAN_RESPONSE_VERB_MASK) != QBMAN_FQ_QUERY_NP);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:52.682163223 +0100
+++ 0198-bus-fslmc-fix-dereferencing-null-pointer.patch	2020-05-19 14:04:44.572654826 +0100
@@ -1,10 +1,11 @@
-From 27ede02945b31e952a66c1bdbf7cf9481698d8dd Mon Sep 17 00:00:00 2001
+From ef6d112d7d5eec99030464e162f8b21428454403 Mon Sep 17 00:00:00 2001
 From: Apeksha Gupta <apeksha.gupta at nxp.com>
 Date: Fri, 8 May 2020 18:32:02 +0530
 Subject: [PATCH] bus/fslmc: fix dereferencing null pointer
 
+[ upstream commit 27ede02945b31e952a66c1bdbf7cf9481698d8dd ]
+
 Fixes: 6fef517e17cf ("bus/fslmc: add qman HW fq query count API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Apeksha Gupta <apeksha.gupta at nxp.com>
 Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>