From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F3336A0613 for ; Fri, 30 Aug 2019 18:38:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 795811E9F9; Fri, 30 Aug 2019 18:36:17 +0200 (CEST) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id C0B861E99F; Fri, 30 Aug 2019 18:35:48 +0200 (CEST) Received: from nis-sj1-27.broadcom.com (nis-sj1-27.lvn.broadcom.net [10.75.144.136]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id B8EE230C092; Fri, 30 Aug 2019 09:35:42 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com B8EE230C092 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1567182942; bh=fDYe0mzubezA/421dwAxazovmuaOcAQJ7uEXtHKqxmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lNdHzUfvhwVhn7qW70McRzsXQnY+AvcEI9PAotv/fEvUOJW6mdPZNWD+8uD+4mVkB 6HLGPsknoOBCyJg81R8BlJUCIvgV89sMvUDoJxPjxxV5hmuGS6YxRfCbD9DOa8nriQ GG7Fp67NJLc75DEr5I+px2YB9qnHCJ8Gw7yMm5sg= Received: from localhost.localdomain (unknown [10.230.30.225]) by nis-sj1-27.broadcom.com (Postfix) with ESMTP id DE0B5AC06AB; Fri, 30 Aug 2019 09:35:43 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Kalesh AP , stable@dpdk.org, Ajit Kumar Khaparde , Rahul Gupta , Lance Richardson Date: Fri, 30 Aug 2019 09:35:37 -0700 Message-Id: <20190830163537.32704-14-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: <20190830163537.32704-1-ajit.khaparde@broadcom.com> References: <2a851a62-f5a1-7061-edb4-412db0d335ce@intel.com> <20190830163537.32704-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 13/13] net/bnxt: avoid null pointer dereference X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Kalesh AP Commit "bd0a14c99f65" enables the creation of a dedicated completion ring for asynchronous event handling instead of handling these events on a receive completion ring on non Stingray Platforms. This causes a segfault due to NULL pointer defreference in bnxt_alloc_async_cp_ring() on stingray. Fix this by checking the pointer validity before accessing it. Fixes: bd0a14c99f65 ("net/bnxt: use dedicated CPR for async events") Cc: stable@dpdk.org Signed-off-by: Kalesh AP Signed-off-by: Ajit Kumar Khaparde Reviewed-by: Rahul Gupta Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_ring.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c index 2f57e038a..ec17783cf 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -694,13 +694,15 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp) int bnxt_alloc_async_cp_ring(struct bnxt *bp) { struct bnxt_cp_ring_info *cpr = bp->async_cp_ring; - struct bnxt_ring *cp_ring = cpr->cp_ring_struct; + struct bnxt_ring *cp_ring; uint8_t ring_type; int rc; - if (BNXT_NUM_ASYNC_CPR(bp) == 0) + if (BNXT_NUM_ASYNC_CPR(bp) == 0 || cpr == NULL) return 0; + cp_ring = cpr->cp_ring_struct; + if (BNXT_HAS_NQ(bp)) ring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_NQ; else -- 2.20.1 (Apple Git-117)