Skip to content

Commit

Permalink
net: mellanox: mlxbf_gige: Fix skb_panic splat under memory pressure
Browse files Browse the repository at this point in the history
[ Upstream commit d68cb7c ]

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 <tbogendoerfer@suse.de>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230524194908.147145-1-tbogendoerfer@suse.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Thomas Bogendoerfer authored and gregkh committed Jun 9, 2023
1 parent 724aa4f commit ae0ef97
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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++;
Expand Down

0 comments on commit ae0ef97

Please sign in to comment.