From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1545242B9A for ; Thu, 25 May 2023 12:37:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0883E42D3B; Thu, 25 May 2023 12:37:15 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 8282B42D38; Thu, 25 May 2023 12:37:13 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34P9Il39025637; Thu, 25 May 2023 03:37:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=qYs25ZXfnGe51QT8i4c7DAYsiQUh1+sENiSBIabishs=; b=F55Pe6AIR9qXirHbyKQA7I9Sdu99MvhXGMnic+yQb303NjL7/7DCDC3uT2Ig3Cf56Fpi YndwIXzhOnWc/AgbVssdZzNsARsOucdozJvd1CujZufntkSR8RqufA3esAcTdqxezme7 6XLOU0CK2SpoBRuTHplPUSW6dopkkVUnA+FQ90FPrMzpYsprTnscgAy9CPG0YPtT6CPX b+g73y4js7/DDY31pEgLUs88SFiAGP1tswNC08VQQp/2bE9QPod6rjCtp8jmN5xbSxFw LMUJHqg+1jdfc4/iya/I7r4XAMOIeKxRrSOUZIEmNxg6yWEcJreg+/YRoAMZxUCI1fmU 5g== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3qsspt2cm7-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 25 May 2023 03:37:12 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Thu, 25 May 2023 03:37:11 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Thu, 25 May 2023 03:37:11 -0700 Received: from hyd1588t430.caveonetworks.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id EA80A5B6BD8; Thu, 25 May 2023 02:59:52 -0700 (PDT) From: Nithin Dabilpuram To: Nithin Kumar Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , , Gowrishankar Muthukrishnan , Subject: [PATCH v3 12/32] common/cnxk: fix null pointer dereference Date: Thu, 25 May 2023 15:28:44 +0530 Message-ID: <20230525095904.3967080-12-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230525095904.3967080-1-ndabilpuram@marvell.com> References: <20230411091144.1087887-1-ndabilpuram@marvell.com> <20230525095904.3967080-1-ndabilpuram@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: 2gMFPBSPY_1do2rgKsRjEWSAk9vwDlft X-Proofpoint-ORIG-GUID: 2gMFPBSPY_1do2rgKsRjEWSAk9vwDlft X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-05-25_06,2023-05-24_01,2023-05-22_02 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Gowrishankar Muthukrishnan Fix null pointer dereferences reported by klocwork. Fixes: 4398c4092f3d ("common/cnxk: dump inline device RQ context") Fixes: 79dc6f324e82 ("common/cnxk: add inline function for statistics") cc: stable@dpdk.org Signed-off-by: Gowrishankar Muthukrishnan --- drivers/common/cnxk/roc_nix_debug.c | 8 +++++++- drivers/common/cnxk/roc_nix_inl_dev.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_nix_debug.c b/drivers/common/cnxk/roc_nix_debug.c index 399d0d7eae..a1c3db284b 100644 --- a/drivers/common/cnxk/roc_nix_debug.c +++ b/drivers/common/cnxk/roc_nix_debug.c @@ -733,7 +733,13 @@ roc_nix_queues_ctx_dump(struct roc_nix *roc_nix, FILE *file) inl_rq = roc_nix_inl_dev_rq(roc_nix); if (inl_rq) { struct idev_cfg *idev = idev_get_cfg(); - struct nix_inl_dev *inl_dev = idev->nix_inl_dev; + struct nix_inl_dev *inl_dev = NULL; + + if (idev && idev->nix_inl_dev) + inl_dev = idev->nix_inl_dev; + + if (!inl_dev) + return -EINVAL; rc = nix_q_ctx_get(&inl_dev->dev, NIX_AQ_CTYPE_RQ, inl_rq->qid, &ctx); if (rc) { diff --git a/drivers/common/cnxk/roc_nix_inl_dev.c b/drivers/common/cnxk/roc_nix_inl_dev.c index 0df148c3ed..ca948d3bc7 100644 --- a/drivers/common/cnxk/roc_nix_inl_dev.c +++ b/drivers/common/cnxk/roc_nix_inl_dev.c @@ -843,7 +843,7 @@ roc_nix_inl_dev_stats_get(struct roc_nix_stats *stats) if (stats == NULL) return NIX_ERR_PARAM; - if (!idev && idev->nix_inl_dev) + if (idev && idev->nix_inl_dev) inl_dev = idev->nix_inl_dev; if (!inl_dev) -- 2.25.1