Commit d68cb7cf authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Jakub Kicinski
Browse files

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: f92e1869 ("Add Mellanox BlueField Gigabit Ethernet driver")
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230524194908.147145-1-tbogendoerfer@suse.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 50fb587e

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

+7 −6
Original line number Diff line number Diff line
@@ -245,12 +245,6 @@ static bool mlxbf_gige_rx_packet(struct mlxbf_gige *priv, int *rx_pkts) 


		skb = priv->rx_skb[rx_pi_rem];



		skb_put(skb, datalen);



		skb->ip_summed = CHECKSUM_NONE; /* device did not checksum packet */



		skb->protocol = eth_type_trans(skb, netdev);



		/* Alloc another RX SKB for this same index */

		rx_skb = mlxbf_gige_alloc_skb(priv, MLXBF_GIGE_DEFAULT_BUF_SZ,

					      &rx_buf_dma, DMA_FROM_DEVICE);
@@ -259,6 +253,13 @@ static bool mlxbf_gige_rx_packet(struct mlxbf_gige *priv, int *rx_pkts) 
		priv->rx_skb[rx_pi_rem] = rx_skb;

		dma_unmap_single(priv->dev, *rx_wqe_addr,

				 MLXBF_GIGE_DEFAULT_BUF_SZ, DMA_FROM_DEVICE);



		skb_put(skb, datalen);



		skb->ip_summed = CHECKSUM_NONE; /* device did not checksum packet */



		skb->protocol = eth_type_trans(skb, netdev);



		*rx_wqe_addr = rx_buf_dma;

	} else if (rx_cqe & MLXBF_GIGE_RX_CQE_PKT_STATUS_MAC_ERR) {

		priv->stats.rx_mac_errors++;