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 F0CCFA0613 for ; Wed, 28 Aug 2019 15:43:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E6F861C226; Wed, 28 Aug 2019 15:43:16 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B6DF81C226 for ; Wed, 28 Aug 2019 15:43:14 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 27D2AC056808; Wed, 28 Aug 2019 13:43:14 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E20F196AE; Wed, 28 Aug 2019 13:43:12 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Wed, 28 Aug 2019 14:41:59 +0100 Message-Id: <20190828134234.20547-23-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 28 Aug 2019 13:43:14 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnxt: fix crash on probe failure' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 09/04/19. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/5c1b72f67e354bcde6f3dad0f791a9150ce4ac61 Thanks. Kevin Traynor --- >From 5c1b72f67e354bcde6f3dad0f791a9150ce4ac61 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 17 Jul 2019 16:11:26 +0530 Subject: [PATCH] net/bnxt: fix crash on probe failure [ upstream commit 2c43b439e50df5e1ebf8f97c1e600825d9601ec9 ] Fixed couple of possible segfaults due to NULL pointer dereference in case of probe failure. Fixes: c09f57b49c13 ("net/bnxt: add start/stop/link update operations") Signed-off-by: Kalesh AP Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_irq.c | 3 +++ drivers/net/bnxt/bnxt_vnic.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c index e3aac7cbe..8ea17793e 100644 --- a/drivers/net/bnxt/bnxt_irq.c +++ b/drivers/net/bnxt/bnxt_irq.c @@ -53,4 +53,7 @@ void bnxt_free_int(struct bnxt *bp) struct bnxt_irq *irq; + if (bp->irq_tbl == NULL) + return; + irq = bp->irq_tbl; if (irq) { diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c index aebfb1f1c..9ebe7c963 100644 --- a/drivers/net/bnxt/bnxt_vnic.c +++ b/drivers/net/bnxt/bnxt_vnic.c @@ -90,4 +90,7 @@ void bnxt_free_vnic_attributes(struct bnxt *bp) unsigned int i; + if (bp->vnic_info == NULL) + return; + for (i = 0; i < bp->max_vnics; i++) { vnic = &bp->vnic_info[i]; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:33.151776005 +0100 +++ 0024-net-bnxt-fix-crash-on-probe-failure.patch 2019-08-28 14:32:31.636957471 +0100 @@ -1 +1 @@ -From 2c43b439e50df5e1ebf8f97c1e600825d9601ec9 Mon Sep 17 00:00:00 2001 +From 5c1b72f67e354bcde6f3dad0f791a9150ce4ac61 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2c43b439e50df5e1ebf8f97c1e600825d9601ec9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 0bb3eb4fa..61f7498a5 100644 +index e3aac7cbe..8ea17793e 100644 @@ -32 +33 @@ -index 262cfc18d..20e5bf2d1 100644 +index aebfb1f1c..9ebe7c963 100644