Skip to content

Commit b490fb0

Browse files
committed
eth: bnxt: fix missing ring index trim on error path
JIRA: https://issues.redhat.com/browse/RHEL-106550 CVE: CVE-2025-37873 commit 12f2d03 Author: Jakub Kicinski <kuba@kernel.org> Date: Mon Apr 14 07:32:10 2025 -0700 eth: bnxt: fix missing ring index trim on error path 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 <michael.chan@broadcom.com> Link: https://patch.msgid.link/20250414143210.458625-1-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
1 parent 070ed66 commit b490fb0

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
@@ -783,15 +783,15 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)
783783
dev_kfree_skb_any(skb);
784784
tx_kick_pending:
785785
if (BNXT_TX_PTP_IS_SET(lflags)) {
786-
txr->tx_buf_ring[txr->tx_prod].is_ts_pkt = 0;
786+
txr->tx_buf_ring[RING_TX(bp, txr->tx_prod)].is_ts_pkt = 0;
787787
atomic64_inc(&bp->ptp_cfg->stats.ts_err);
788788
if (!(bp->fw_cap & BNXT_FW_CAP_TX_TS_CMP))
789789
/* set SKB to err so PTP worker will clean up */
790790
ptp->txts_req[txts_prod].tx_skb = ERR_PTR(-EIO);
791791
}
792792
if (txr->kick_pending)
793793
bnxt_txr_db_kick(bp, txr, txr->tx_prod);
794-
txr->tx_buf_ring[txr->tx_prod].skb = NULL;
794+
txr->tx_buf_ring[RING_TX(bp, txr->tx_prod)].skb = NULL;
795795
dev_core_stats_tx_dropped_inc(dev);
796796
return NETDEV_TX_OK;
797797
}

0 commit comments

Comments
 (0)