Skip to content

Commit d68cb7c

Browse files
Thomas Bogendoerferkuba-moo
authored andcommitted
net: mellanox: mlxbf_gige: Fix skb_panic splat under memory pressure
Do skb_put() after a new skb has been successfully allocated otherwise the reused skb leads to skb_panics or incorrect packet sizes. Fixes: f92e186 ("Add Mellanox BlueField Gigabit Ethernet driver") Signed-off-by: Thomas Bogendoerfer <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 50fb587 commit d68cb7c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,6 @@ static bool mlxbf_gige_rx_packet(struct mlxbf_gige *priv, int *rx_pkts)
245245

246246
skb = priv->rx_skb[rx_pi_rem];
247247

248-
skb_put(skb, datalen);
249-
250-
skb->ip_summed = CHECKSUM_NONE; /* device did not checksum packet */
251-
252-
skb->protocol = eth_type_trans(skb, netdev);
253-
254248
/* Alloc another RX SKB for this same index */
255249
rx_skb = mlxbf_gige_alloc_skb(priv, MLXBF_GIGE_DEFAULT_BUF_SZ,
256250
&rx_buf_dma, DMA_FROM_DEVICE);
@@ -259,6 +253,13 @@ static bool mlxbf_gige_rx_packet(struct mlxbf_gige *priv, int *rx_pkts)
259253
priv->rx_skb[rx_pi_rem] = rx_skb;
260254
dma_unmap_single(priv->dev, *rx_wqe_addr,
261255
MLXBF_GIGE_DEFAULT_BUF_SZ, DMA_FROM_DEVICE);
256+
257+
skb_put(skb, datalen);
258+
259+
skb->ip_summed = CHECKSUM_NONE; /* device did not checksum packet */
260+
261+
skb->protocol = eth_type_trans(skb, netdev);
262+
262263
*rx_wqe_addr = rx_buf_dma;
263264
} else if (rx_cqe & MLXBF_GIGE_RX_CQE_PKT_STATUS_MAC_ERR) {
264265
priv->stats.rx_mac_errors++;

0 commit comments

Comments
 (0)