]> www.infradead.org Git - users/hch/misc.git/commitdiff
eth: bnxt: fix missing ring index trim on error path
authorJakub Kicinski <kuba@kernel.org>
Mon, 14 Apr 2025 14:32:10 +0000 (07:32 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 16 Apr 2025 00:38:42 +0000 (17:38 -0700)
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: 6d1add95536b ("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>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index 8725e1e13908258f56698da661353a21ad319407..c8e3468eee612ad622bfbecfd7cc1ae3396061fd 100644 (file)
@@ -787,7 +787,7 @@ tx_free:
        dev_kfree_skb_any(skb);
 tx_kick_pending:
        if (BNXT_TX_PTP_IS_SET(lflags)) {
-               txr->tx_buf_ring[txr->tx_prod].is_ts_pkt = 0;
+               txr->tx_buf_ring[RING_TX(bp, txr->tx_prod)].is_ts_pkt = 0;
                atomic64_inc(&bp->ptp_cfg->stats.ts_err);
                if (!(bp->fw_cap & BNXT_FW_CAP_TX_TS_CMP))
                        /* set SKB to err so PTP worker will clean up */
@@ -795,7 +795,7 @@ tx_kick_pending:
        }
        if (txr->kick_pending)
                bnxt_txr_db_kick(bp, txr, txr->tx_prod);
-       txr->tx_buf_ring[txr->tx_prod].skb = NULL;
+       txr->tx_buf_ring[RING_TX(bp, txr->tx_prod)].skb = NULL;
        dev_core_stats_tx_dropped_inc(dev);
        return NETDEV_TX_OK;
 }