FAILED: patch "[PATCH] bnxt_en: Fix NULL pointer dereference" failed to apply to 5.10-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x d930276f2cddd0b7294cac7a8fe7b877f6d9e08d
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026061544-stony-launder-1952@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d930276f2cddd0b7294cac7a8fe7b877f6d9e08d Mon Sep 17 00:00:00 2001
From: Kyle Meyer <[email protected]>
Date: Fri, 5 Jun 2026 17:25:24 -0500
Subject: [PATCH] bnxt_en: Fix NULL pointer dereference
PCIe errors detected by a Root Port or Downstream Port cause error recovery services to run on all subordinate devices regardless of administrative state.
The .error_detected() callback, bnxt_io_error_detected(), disables and synchronizes IRQs via bnxt_disable_int_sync(), which calls bnxt_cp_num_to_irq_num() to map completion rings to IRQs using bp->bnapi.
Since bp->bnapi is allocated on NIC open and freed on NIC close, PCIe error recovery on a closed NIC can dereference a NULL pointer.
Check if bp->bnapi is NULL before disabling and synchronizing IRQs.
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -5748,7 +5748,7 @@ static void bnxt_disable_int_sync(struct bnxt *bp) {int i; -if (!bp->irq_tbl) +if (!bp->irq_tbl || !bp->bnapi)return ;atomic_inc (&bp->intr_sem);
Sasha Levin
maintainerPATCH 1/2 bnxt_en: Modify bnxt_disable_int_sync() to be called more than once.
From: Michael Chan <[email protected]>
[ Upstream commit 38290e37297087f7ea3ef7904b8f185d77c42976 ]
In the event of a fatal firmware error, we want to disable IRQ early in the recovery sequence. This change will allow it to be called safely again as part of the normal shutdown sequence.
Stable-dep-of: d930276f2cdd ("bnxt_en: Fix NULL pointer dereference")
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -0
@@ -4382,6 +4382,9 @@ static void bnxt_disable_int_sync(struct bnxt *bp) {int i; +if (!bp->irq_tbl) +return ; +atomic_inc (&bp->intr_sem);bnxt_disable_int (bp);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 bnxt_en: Fix NULL pointer dereference
From: Kyle Meyer <[email protected]>
[ Upstream commit d930276f2cddd0b7294cac7a8fe7b877f6d9e08d ]
PCIe errors detected by a Root Port or Downstream Port cause error recovery services to run on all subordinate devices regardless of administrative state.
The .error_detected() callback, bnxt_io_error_detected(), disables and synchronizes IRQs via bnxt_disable_int_sync(), which calls bnxt_cp_num_to_irq_num() to map completion rings to IRQs using bp->bnapi.
Since bp->bnapi is allocated on NIC open and freed on NIC close, PCIe error recovery on a closed NIC can dereference a NULL pointer.
Check if bp->bnapi is NULL before disabling and synchronizing IRQs.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -4382,7 +4382,7 @@ static void bnxt_disable_int_sync(struct bnxt *bp) {int i; -if (!bp->irq_tbl) +if (!bp->irq_tbl || !bp->bnapi)return ;atomic_inc (&bp->intr_sem);
Signature · 1 line
2.53.0