Skip to content

Commit 0983d28

Browse files
Nick ChildPaolo Abeni
authored andcommitted
ibmvnic: Add tx check to prevent skb leak
Below is a summary of how the driver stores a reference to an skb during transmit: tx_buff[free_map[consumer_index]]->skb = new_skb; free_map[consumer_index] = IBMVNIC_INVALID_MAP; consumer_index ++; Where variable data looks like this: free_map == [4, IBMVNIC_INVALID_MAP, IBMVNIC_INVALID_MAP, 0, 3] consumer_index^ tx_buff == [skb=null, skb=<ptr>, skb=<ptr>, skb=null, skb=null] The driver has checks to ensure that free_map[consumer_index] pointed to a valid index but there was no check to ensure that this index pointed to an unused/null skb address. So, if, by some chance, our free_map and tx_buff lists become out of sync then we were previously risking an skb memory leak. This could then cause tcp congestion control to stop sending packets, eventually leading to ETIMEDOUT. Therefore, add a conditional to ensure that the skb address is null. If not then warn the user (because this is still a bug that should be patched) and free the old pointer to prevent memleak/tcp problems. Signed-off-by: Nick Child <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent 482000c commit 0983d28

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2482,6 +2482,18 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
24822482
(tx_pool->consumer_index + 1) % tx_pool->num_buffers;
24832483

24842484
tx_buff = &tx_pool->tx_buff[bufidx];
2485+
2486+
/* Sanity checks on our free map to make sure it points to an index
2487+
* that is not being occupied by another skb. If skb memory is
2488+
* not freed then we see congestion control kick in and halt tx.
2489+
*/
2490+
if (unlikely(tx_buff->skb)) {
2491+
dev_warn_ratelimited(dev, "TX free map points to untracked skb (%s %d idx=%d)\n",
2492+
skb_is_gso(skb) ? "tso_pool" : "tx_pool",
2493+
queue_num, bufidx);
2494+
dev_kfree_skb_any(tx_buff->skb);
2495+
}
2496+
24852497
tx_buff->skb = skb;
24862498
tx_buff->index = bufidx;
24872499
tx_buff->pool_index = queue_num;

0 commit comments

Comments
 (0)