netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] fm10k: fix memory leak
@ 2015-11-17 22:24 Stephen Hemminger
  2015-11-18 20:06 ` David Miller
  2015-11-18 21:53 ` Eric Dumazet
  0 siblings, 2 replies; 4+ messages in thread
From: Stephen Hemminger @ 2015-11-17 22:24 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: netdev

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

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c	2015-11-17 13:33:40.032694657 -0800
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c	2015-11-17 14:13:03.086942495 -0800
@@ -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);

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] fm10k: fix memory leak
  2015-11-17 22:24 [PATCH] fm10k: fix memory leak Stephen Hemminger
@ 2015-11-18 20:06 ` David Miller
  2015-11-18 20:47   ` Jeff Kirsher
  2015-11-18 21:53 ` Eric Dumazet
  1 sibling, 1 reply; 4+ messages in thread
From: David Miller @ 2015-11-18 20:06 UTC (permalink / raw)
  To: shemming; +Cc: jeffrey.t.kirsher, netdev

From: Stephen Hemminger <shemming@brocade.com>
Date: Tue, 17 Nov 2015 14:24:27 -0800

> This was detected by Coverity.
> The function skb_cow_head leaves skb alone on failure, so caller needs
> to free.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

Applied.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] fm10k: fix memory leak
  2015-11-18 20:06 ` David Miller
@ 2015-11-18 20:47   ` Jeff Kirsher
  0 siblings, 0 replies; 4+ messages in thread
From: Jeff Kirsher @ 2015-11-18 20:47 UTC (permalink / raw)
  To: David Miller, shemming; +Cc: netdev

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]

On Wed, 2015-11-18 at 15:06 -0500, David Miller wrote:
> From: Stephen Hemminger <shemming@brocade.com>
> Date: Tue, 17 Nov 2015 14:24:27 -0800
> 
> > This was detected by Coverity.
> > The function skb_cow_head leaves skb alone on failure, so caller
> > needs
> > to free.
> > 
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> 
> Applied.

Thanks, got slammed with emails and this got overlooked.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] fm10k: fix memory leak
  2015-11-17 22:24 [PATCH] fm10k: fix memory leak Stephen Hemminger
  2015-11-18 20:06 ` David Miller
@ 2015-11-18 21:53 ` Eric Dumazet
  1 sibling, 0 replies; 4+ messages in thread
From: Eric Dumazet @ 2015-11-18 21:53 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: Jeff Kirsher, netdev

On Tue, 2015-11-17 at 14:24 -0800, Stephen Hemminger wrote:
> This was detected by Coverity.
> The function skb_cow_head leaves skb alone on failure, so caller needs
> to free.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> 
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c	2015-11-17 13:33:40.032694657 -0800
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c	2015-11-17 14:13:03.086942495 -0800
> @@ -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 */
>  


kfree_skb() to be drop monitor friendly ?

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-11-18 21:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-17 22:24 [PATCH] fm10k: fix memory leak Stephen Hemminger
2015-11-18 20:06 ` David Miller
2015-11-18 20:47   ` Jeff Kirsher
2015-11-18 21:53 ` Eric Dumazet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).