From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 069C9A0568;
Mon, 2 Mar 2020 10:26:52 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 7B8E71C022;
Mon, 2 Mar 2020 10:26:38 +0100 (CET)
Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13])
by dpdk.org (Postfix) with ESMTP id E012E4C9D;
Mon, 2 Mar 2020 10:26:35 +0100 (CET)
Received: from inva020.nxp.com (localhost [127.0.0.1])
by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id C0E651A0FBB;
Mon, 2 Mar 2020 10:26:35 +0100 (CET)
Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com
[165.114.16.14])
by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 40EE81A0FAD;
Mon, 2 Mar 2020 10:26:33 +0100 (CET)
Received: from bf-netperf1.ap.com (bf-netperf1.ap.freescale.net
[10.232.133.63])
by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 61EEC402A7;
Mon, 2 Mar 2020 17:26:29 +0800 (SGT)
From: Hemant Agrawal <hemant.agrawal@nxp.com>
To: ferruh.yigit@intel.com
Cc: dev@dpdk.org,
stable@dpdk.org,
Apeksha Gupta <apeksha.gupta@nxp.com>
Date: Mon, 2 Mar 2020 20:28:15 +0530
Message-Id: <20200302145829.27808-3-hemant.agrawal@nxp.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200302145829.27808-1-hemant.agrawal@nxp.com>
References: <20200302145829.27808-1-hemant.agrawal@nxp.com>
X-Virus-Scanned: ClamAV using ClamSMTP
Subject: [dpdk-dev] [PATCH 02/16] bus/fslmc: fix dereferencing null pointer
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Apeksha Gupta <apeksha.gupta@nxp.com>
This patch fixees the nxp internal coverity reported
null pointer dereferncing issue.
Fixes: 6fef517e17cf ("bus/fslmc: add qman HW fq query count API")
Cc: stable@dpdk.org
Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
---
drivers/bus/fslmc/qbman/qbman_debug.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c b/drivers/bus/fslmc/qbman/qbman_debug.c
index 0bb2ce880..34374ae4b 100644
--- a/drivers/bus/fslmc/qbman/qbman_debug.c
+++ b/drivers/bus/fslmc/qbman/qbman_debug.c
@@ -20,26 +20,27 @@ struct qbman_fq_query_desc {
uint8_t verb;
uint8_t reserved[3];
uint32_t fqid;
- uint8_t reserved2[57];
+ uint8_t reserved2[56];
};
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.17.1