Skip to content

Commit a1cb560

Browse files
committed
eth: bnxt: fix missing ring index trim on error path
jira LE-4297 cve CVE-2025-37873 Rebuild_History Non-Buildable kernel-6.12.0-55.34.1.el10_0 commit-author Jakub Kicinski <[email protected]> commit 12f2d03 Commit under Fixes converted tx_prod to be free running but missed masking it on the Tx error path. This crashes on error conditions, for example when DMA mapping fails. Fixes: 6d1add9 ("bnxt_en: Modify TX ring indexing logic.") Reviewed-by: Michael Chan <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> (cherry picked from commit 12f2d03) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 08c2f31 commit a1cb560

File tree

1 file changed

+2
-2
lines changed
  • drivers/net/ethernet/broadcom/bnxt

1 file changed

+2
-2
lines changed

drivers/net/ethernet/broadcom/bnxt/bnxt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,15 +758,15 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)
758758
dev_kfree_skb_any(skb);
759759
tx_kick_pending:
760760
if (BNXT_TX_PTP_IS_SET(lflags)) {
761-
txr->tx_buf_ring[txr->tx_prod].is_ts_pkt = 0;
761+
txr->tx_buf_ring[RING_TX(bp, txr->tx_prod)].is_ts_pkt = 0;
762762
atomic64_inc(&bp->ptp_cfg->stats.ts_err);
763763
if (!(bp->fw_cap & BNXT_FW_CAP_TX_TS_CMP))
764764
/* set SKB to err so PTP worker will clean up */
765765
ptp->txts_req[txts_prod].tx_skb = ERR_PTR(-EIO);
766766
}
767767
if (txr->kick_pending)
768768
bnxt_txr_db_kick(bp, txr, txr->tx_prod);
769-
txr->tx_buf_ring[txr->tx_prod].skb = NULL;
769+
txr->tx_buf_ring[RING_TX(bp, txr->tx_prod)].skb = NULL;
770770
dev_core_stats_tx_dropped_inc(dev);
771771
return NETDEV_TX_OK;
772772
}

0 commit comments

Comments
 (0)