Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795059437; b=ZM1VMQMv/odWIlM1h6uKgpWmNvdjY8dP2T7ROmmEcPli6jGJec42U+HdUkffJ2dFr4fU 9w/g3hKn3E1CjC8mWypSTS/epz1mqGtKvA1DLADlwuw4nzaxYJhUJps4jJl9LZfrxDJ75 dxUZejSoBShnIeryJOyGrAxReyN5QagZfBen5wc8F9z+dKGemTC0FAUzhMxHJivG822KI JeJEqu59ec0XAeNiueX6ghCj46INGb7kSL6tmP++qEHNfn+T6og3tEsrMC0+znOJ9VZur mTrq9b+RxDpt70IoSN9rRTg4pDkUtzooB3lfw/3AZF/1SHqcrCwmfZUZmQPQux2cxKw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795059437; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=6Z35+6lirR+QcYn+cjHTxmjxjqCdbbRiTUjflAZHSKo=; b=bt34TL6eOpRCRWjq6SQ2NEyHmfG1PuxcsGyH+WWDXNbI78B6S5bUfaZiXpLlqqpSbxT3 oEr3FRmfyMQIMCLffRYN/WFhnUH7ip/C5JOb833/3Q11qVlMw2SnJ21tPcUS1psOxUOec 20gubHtod7K7MT5IyLC7lf2SEtBwmVt5TjL8RS/PDBUx02tF5tkV6cBMityqh+Ppv/41g F3qBfFT52gxiZqshX6CqoH5QWTaemAbn8I0EtnjPwA+tCfqGcZVYzxkcg967pTC2d9xAi WKjN68bOw16Y8/Lm3diKk1lTtxZGdYS/OXkwjpRvSDvjnr1tlgKTTdIfMDcJZRAVl2w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="u/aWrDHK"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0131D606A320; Thu, 19 Nov 2026 03:37:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=u/aWrDHK Received: by smtp.kernel.org (Postfix) with ESMTPSA id 091031F000C4; Thu, 19 Nov 2026 03:37:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795059436; bh=6Z35+6lirR+QcYn+cjHTxmjxjqCdbbRiTUjflAZHSKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=u/aWrDHKOJ9d9jhC8aNy9tKpzK5iVQ86Jh6AAAFPPYHDTrelRd4cKs2n574qvLRCb TpPmvOSH2Xh1+yZxSW1c9TGQ398Ckc8o9j18qx+dB4hGheQT96iCqtIJa3U6MZ3Vff aJfDoB0mX03OpSG7BGAkYBAV1WebM15XMYfJmEVQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vaibhav Nagare , Simon Horman , Paolo Abeni , Sasha Levin Subject: [PATCH 5.10 0839/1848] bnxt_en: dont leave an XDP program installed when the open fails Date: Wed, 18 Nov 2026 15:47:57 +0100 Message-ID: <20261118145951.771605919@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vaibhav Nagare [ Upstream commit 78731b46967e3e7102b5cd5062bef185f3404b5c ] bnxt_xdp_set() stores the new program and drops the reference on the old one before reopening the NIC. If bnxt_open_nic() then fails, ndo_bpf() returns an error with the new program still in bp->xdp_prog. The caller treats the error as "nothing was installed" and drops its own reference, so bp->xdp_prog is left pointing at a freed program and the next XDP update dereferences it: BUG: unable to handle page fault for address: ff78ecc80ddd1038 RIP: 0010:__bpf_prog_put+0x5/0x80 Call Trace: bnxt_xdp_set+0xad/0x1b0 [bnxt_en] dev_xdp_propagate+0x36/0xa0 bond_xdp_set+0xeb/0x2d0 [bonding] dev_xdp_install+0x1b1/0x350 bpf_xdp_link_update+0xc5/0x1b0 link_update+0x104/0x1e0 __sys_bpf+0x662/0xcf0 Seen on a 6.12 based kernel after bnxt_alloc_mem() failed an order-4 allocation on a fragmented host: bnxt_en 0000:a0:00.1 ens4f1np1: nic open fail (rc: fffffff4) bond1: (slave ens4f1np1): Error -12 calling ndo_bpf Bonding is not required to hit this; a plain XDP attach on a bnxt interface takes the same path. Restore the previous program when an attach or a replace fails, and recompute the page-mode and XDP TX ring configuration from it. The configuration matters because bnxt_init_one_rx_ring() only assigns rxr->xdp_prog in page mode, and __bnxt_set_rx_skb_mode() derives dev->max_mtu from the installed program. Release the old program only once the change has been committed. A detach is not undone. dev_xdp_detach_link() clears the core's record of the program even when the driver returns an error, so putting the program back would leave the driver running a program the core has already dropped. If the reopen fails during a detach, bnxt_xdp_set() therefore returns 0 with the device closed; bnxt_open_nic() has already logged the failure. Found in a crash dump; the change was not tested on hardware. Fixes: c6d30e8391b8 ("bnxt_en: Add basic XDP support.") Cc: stable@vger.kernel.org Signed-off-by: Vaibhav Nagare Reviewed-by: Simon Horman Link: https://patch.msgid.link/20261012072802.2153706-1-vnagare@redhat.com Signed-off-by: Paolo Abeni [ sashal: reused existing inline configuration through an apply_cfg label instead of introducing bnxt_xdp_apply_cfg() ] Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c index dc9afaa14da8f..2853386b89646 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c @@ -268,6 +268,7 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) struct net_device *dev = bp->dev; int tx_xdp = 0, rc, tc; struct bpf_prog *old; + int old_tx_xdp; if (prog && bp->dev->mtu > BNXT_MAX_PAGE_MODE_MTU) { netdev_warn(dev, "MTU %d larger than largest XDP supported MTU %d.\n", @@ -293,11 +294,12 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) if (netif_running(dev)) bnxt_close_nic(bp, true, false); + old_tx_xdp = bp->tx_nr_rings_xdp; old = xchg(&bp->xdp_prog, prog); - if (old) - bpf_prog_put(old); - if (prog) { +apply_cfg: + tc = netdev_get_num_tc(dev) ? : 1; + if (bp->xdp_prog) { bnxt_set_rx_skb_mode(bp, true); } else { int rx, tx; @@ -315,8 +317,21 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) bnxt_set_tpa_flags(bp); bnxt_set_ring_params(bp); - if (netif_running(dev)) - return bnxt_open_nic(bp, true, false); + if (rc) + return rc; + + if (netif_running(dev)) { + rc = bnxt_open_nic(bp, true, false); + /* a detach cannot be undone, only an attach */ + if (rc && prog) { + WRITE_ONCE(bp->xdp_prog, old); + tx_xdp = old_tx_xdp; + goto apply_cfg; + } + } + + if (old) + bpf_prog_put(old); return 0; } -- 2.53.0