Commit 400fc010 authored Jan 12, 2017 by Arkadi Sharshevsky Committed by David S. Miller Jan 12, 2017

mlxsw: switchx2: Fix memory leak at skb reallocation



During transmission the skb is checked for headroom in order to
add vendor specific header. In case the skb needs to be re-allocated,
skb_realloc_headroom() is called to make a private copy of the original,
but doesn't release it. Current code assumes that the original skb is
released during reallocation and only releases it at the error path
which causes a memory leak.

Fix this by adding the original skb release to the main path.

Fixes: d003462a ("mlxsw: Simplify mlxsw_sx_port_xmit function")
Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 36bf38d1

drivers/net/ethernet/mellanox/mlxsw/switchx2.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -345,6 +345,7 @@ static netdev_tx_t mlxsw_sx_port_xmit(struct sk_buff *skb,
		dev_kfree_skb_any(skb_orig);
		return NETDEV_TX_OK;
		}
		dev_consume_skb_any(skb_orig);
		}
		mlxsw_sx_txhdr_construct(skb, &tx_info);
		/* TX header is consumed by HW on the way so we shouldn't count its

Admin message