Skip to contentSkip to conversation

fm10k: fix memory leak

PATCH Applied Stephen Hemminger 4 participants 4 messages Nov 17, 2015 – Nov 18, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fm10k: fix memory leak

This was detected by Coverity.
The function skb_cow_head leaves skb alone on failure, so caller needs to free.

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +3 -1
@@ -627,8 +627,10 @@ static netdev_tx_t fm10k_xmit_frame(stru
 
 		/* verify the skb head is not shared */
 		err = skb_cow_head(skb, 0);
-		if (err)
+		if (err) {
+			dev_kfree_skb(skb);
 			return NETDEV_TX_OK;
+		}
 
 		/* locate vlan header */
 		vhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN);
#2 lore raw
Quoted 11 lines · David Miller

From: Stephen Hemminger <[email protected]>
Date: Tue, 17 Nov 2015 14:24:27 -0800

Quoted 6 lines

This was detected by Coverity.
The function skb_cow_head leaves skb alone on failure, so caller needs
to free.

Applied.

Thanks, got slammed with emails and this got overlooked.

#3 lore raw
In reply to Stephen Hemminger
Quoted 10 lines · Stephen Hemminger

This was detected by Coverity.
The function skb_cow_head leaves skb alone on failure, so caller needs to free.

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +0 -0
@@ -627,8 +627,10 @@ static netdev_tx_t fm10k_xmit_frame(stru
 

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c static netdev_tx_t fm10k_xmit_frame(stru · line 636

Quoted 10 lines
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +3 -1
 		/* verify the skb head is not shared */
 		err = skb_cow_head(skb, 0);
-		if (err)
+		if (err) {
+			dev_kfree_skb(skb);
 			return NETDEV_TX_OK;
+		}
 
 		/* locate vlan header */
 

kfree_skb() to be drop monitor friendly ?