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 D851CA0C47 for ; Tue, 10 Aug 2021 17:40:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CDBB64014F; Tue, 10 Aug 2021 17:40:36 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 99A464014F for ; Tue, 10 Aug 2021 17:40:34 +0200 (CEST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 7DABB3F0A1 for ; Tue, 10 Aug 2021 15:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610034; bh=oVp3aS2Y0iw3uSSAhjzDDFqLo8DyEkEBy4MR4WYlZAk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=wKibR6TgyrDzEWYhSQVQVS8LqZtZSm9pDKpBoCw3DA2ToMQOxyRUf22s2zfkN8KKb S6C4Obvp9jWwKsT7rc58xqsyZf7yq1+xWZLM5oQijAVcUMF0Huj3p3BbbmdxRx7w40 pbJOqlG7GlrB1uKD0HKjmA7aKw2HJeNFwUEg9nJO66a20OpuS3zNdkEnpIX2tGZajG Uhdafa2Ap5ubRyOsiwRK+bPYUJ7qc6t2JUZVRB4wfBuOaVkw6+TxqmmbLeQHB5tJgk dB7JH0Wda4uvujaxZA+CgGCwZBLtCb+59XUoNTRxZbwjY6vYWGzOXslfYoH7JMu4c8 fu+dzGFHEGQnw== Received: by mail-ej1-f71.google.com with SMTP id qf6-20020a1709077f06b029057e66b6665aso5782411ejc.18 for ; Tue, 10 Aug 2021 08:40:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oVp3aS2Y0iw3uSSAhjzDDFqLo8DyEkEBy4MR4WYlZAk=; b=YTjhLC2/u80nJxT5n+wiXNsxJ7rUmmjxueMuPYS88GnBc6CGZfDO3N+e27YP5FllS/ TbvTUPgSIIX2kg9LINTHTAbXubC5jic+2VFk3+Y011jePC0dqYubTrKQZf7XdJUkl7IP 3dwsuVwNlWWLb52TwNd6MKmqmCwaZsFxm9AwfysxB5T/NuEEwa/UM2DNq+jhHEDbdnTy 6xpFphHo7/Xd6m/WPd02BqkHQjA+6KOyF+v/70z6jm5XFlSs5X0kH+iNlLiOmNYVoeBZ WRE3FdI8HcPB0yggPAOWNnbSZgHWF47+yImiugejwHPqJPJCP501GXtbtp4vDlt9uUqJ 3mcw== X-Gm-Message-State: AOAM531dHYXM1cbRUpstwTDbKrSTjbdnVy5heZP6f1Y7wgaLbASqPcxT Tlww3DXv7B3kYjpOTNMmTs94iQy9Y1Z+YR6aR1Gk0HuZjWpA5pu9yV9Rfzx38nVWvtuRo0EhBUU a+/+Iy0w2fTqFhivmkhji0oPy X-Received: by 2002:a17:906:38db:: with SMTP id r27mr9226918ejd.338.1628610034183; Tue, 10 Aug 2021 08:40:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFxCvfr/tl1emKisUmgTLuhNXJ6gcrC8ogI+YzKNtWTwQjM7NQGpEXS2jwST/VKPq0QlTA4g== X-Received: by 2002:a17:906:38db:: with SMTP id r27mr9226901ejd.338.1628610033975; Tue, 10 Aug 2021 08:40:33 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id b25sm9837155edv.9.2021.08.10.08.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:40:33 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Thierry Herbelot Cc: Ajit Khaparde , dpdk stable Date: Tue, 10 Aug 2021 17:38:42 +0200 Message-Id: <20210810154022.749358-2-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: check access to possible null pointer' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/839b753bfcd68c4d628527c869fae708f2deb680 Thanks. Christian Ehrhardt --- >From 839b753bfcd68c4d628527c869fae708f2deb680 Mon Sep 17 00:00:00 2001 From: Thierry Herbelot Date: Mon, 24 May 2021 11:00:38 +0200 Subject: [PATCH] net/bnxt: check access to possible null pointer [ upstream commit dc59260fb68960ab4296d974370594f6ea31ab9f ] Check that pointers are valid before using them. Fixes: 7bc8e9a227ccb ("net/bnxt: support async link notification") Signed-off-by: Thierry Herbelot Acked-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_irq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c index 40e1b0c980..93779f4e0c 100644 --- a/drivers/net/bnxt/bnxt_irq.c +++ b/drivers/net/bnxt/bnxt_irq.c @@ -21,11 +21,14 @@ void bnxt_int_handler(void *param) { struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)param; struct bnxt *bp = eth_dev->data->dev_private; - struct bnxt_cp_ring_info *cpr = bp->async_cp_ring; + struct bnxt_cp_ring_info *cpr; struct cmpl_base *cmp; uint32_t raw_cons; uint32_t cons; + if (bp == NULL) + return; + cpr = bp->async_cp_ring; if (cpr == NULL) return; -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:13.183648054 +0200 +++ 0002-net-bnxt-check-access-to-possible-null-pointer.patch 2021-08-10 15:11:12.886637147 +0200 @@ -1 +1 @@ -From dc59260fb68960ab4296d974370594f6ea31ab9f Mon Sep 17 00:00:00 2001 +From 839b753bfcd68c4d628527c869fae708f2deb680 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dc59260fb68960ab4296d974370594f6ea31ab9f ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 8abbadb3d1..fd8b8fac98 100644 +index 40e1b0c980..93779f4e0c 100644