Skip to contentSkip to conversation

Patch "mlxsw: switchx2: Fix memory leak at skb reallocation" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Feb 1, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mlxsw: switchx2: Fix memory leak at skb reallocation

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mlxsw-switchx2-fix-memory-leak-at-skb-reallocation.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed Feb 1 08:49:51 CET 2017

From: Arkadi Sharshevsky <[email protected]>
Date: Thu, 12 Jan 2017 09:10:38 +0100
Subject: mlxsw: switchx2: Fix memory leak at skb reallocation

From: Arkadi Sharshevsky <[email protected]>

[ Upstream commit 400fc0106dd8c27ed84781c929c1a184785b9c79 ]

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 d003462a50de ("mlxsw: Simplify mlxsw_sx_port_xmit function")
---
 drivers/net/ethernet/mellanox/mlxsw/switchx2.c |    1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlxsw/switchx2.c +1 -0
@@ -313,6 +313,7 @@ static netdev_tx_t mlxsw_sx_port_xmit(st
 			dev_kfree_skb_any(skb_orig);
 			return NETDEV_TX_OK;
 		}
+		dev_consume_skb_any(skb_orig);
 	}
 	mlxsw_sx_txhdr_construct(skb, &tx_info);
 	len = skb->len;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/mlxsw-spectrum-fix-memory-leak-at-skb-reallocation.patch queue-4.4/mlxsw-switchx2-fix-memory-leak-at-skb-reallocation.patch