netdev - Re: [PATCH 34/54] s2io: Call dev_kfree_skb_any instead of dev_kfree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1395764703.12610.156.camel@edumazet-glaptop2.roam.corp.google.com>
Date:	Tue, 25 Mar 2014 09:25:03 -0700
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	"Eric W. Biederman" <ebiederm@...ssion.com>
Cc:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	xiyou.wangcong@...il.com, mpm@...enic.com, satyam.sharma@...il.com
Subject: Re: [PATCH 34/54] s2io: Call dev_kfree_skb_any instead of
 dev_kfree_skb.

On Mon, 2014-03-24 at 23:05 -0700, Eric W. Biederman wrote:
> From: "Eric W. Biederman" <ebiederm@...ssion.com>
> 
> Replace dev_kfree_skb with dev_kfree_skb_any in s2io_xmit that can
> be called in hard irq and other contexts.
> 
> All instances that are changed are packet drops.
> 
> Signed-off-by: "Eric W. Biederman" <ebiederm@...ssion.com>
> ---
>  drivers/net/ethernet/neterion/s2io.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
> index d44fdb91808e..a2844ff322c4 100644
> --- a/drivers/net/ethernet/neterion/s2io.c
> +++ b/drivers/net/ethernet/neterion/s2io.c
> @@ -4049,7 +4049,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
>  	if (!is_s2io_card_up(sp)) {
>  		DBG_PRINT(TX_DBG, "%s: Card going down for reset\n",
>  			  dev->name);
> -		dev_kfree_skb(skb);
> +		dev_kfree_skb_any(skb);
>  		return NETDEV_TX_OK;
>  	}
>  
> @@ -4122,7 +4122,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
>  	    ((put_off+1) == queue_len ? 0 : (put_off+1)) == get_off) {
>  		DBG_PRINT(TX_DBG, "Error in xmit, No free TXDs.\n");
>  		s2io_stop_tx_queue(sp, fifo->fifo_no);
> -		dev_kfree_skb(skb);
> +		dev_kfree_skb_any(skb);

minor nit : This could be done after spin_unlock_irqrestore()...

>  		spin_unlock_irqrestore(&fifo->tx_lock, flags);
>  		return NETDEV_TX_OK;
>  	}
> @@ -4244,7 +4244,7 @@ pci_map_failed:
>  	swstats->pci_map_fail_cnt++;
>  	s2io_stop_tx_queue(sp, fifo->fifo_no);
>  	swstats->mem_freed += skb->truesize;
> -	dev_kfree_skb(skb);
> +	dev_kfree_skb_any(skb);
>  	spin_unlock_irqrestore(&fifo->tx_lock, flags);
>  	return NETDEV_TX_OK;
>  }

Acked-by: Eric Dumazet <edumazet@...gle.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html