netdev - Re: [PATCH] ath9k: fix a memory leak in ath_rx

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]

Date:	Fri, 16 Mar 2012 10:00:10 -0400
From:	"John W. Linville" <linville@...driver.com>
To:	Eric Dumazet <eric.dumazet@...il.com>
Cc:	David Miller <davem@...emloft.net>,
	Jouni Malinen <jouni@....qualcomm.com>,
	Felix Fietkau <nbd@...nwrt.org>,
	Trond Wuellner <trond@...omium.org>,
	Grant Grundler <grundler@...omium.org>,
	Paul Stewart <pstew@...omium.org>,
	netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH] ath9k: fix a memory leak in ath_rx_tasklet()

On Thu, Mar 15, 2012 at 01:43:29PM -0700, Eric Dumazet wrote:
> commit 0d95521ea7 (ath9k: use split rx buffers to get rid of order-1 skb
> allocations) added in memory leak in error path.
> 
> sc->rx.frag should be cleared after the pskb_expand_head() call, or else
> we jump to requeue_drop_frag and leak an skb.
> 
> Signed-off-by: Eric Dumazet <eric.dumazet@...il.com>
> Cc: Jouni Malinen <jouni@....qualcomm.com>
> Cc: Felix Fietkau <nbd@...nwrt.org>
> Cc: John W. Linville <linville@...driver.com>
> Cc: Trond Wuellner <trond@...omium.org>
> Cc: Grant Grundler <grundler@...omium.org>
> Cc: Paul Stewart <pstew@...omium.org>
> Cc: David Miller <davem@...emloft.net>

Acked-by: John W. Linville <linville@...driver.com>

Dave, will you pick this up yourself?  Or should I take it around the bend?

John

> ---
>  drivers/net/wireless/ath/ath9k/recv.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
> index 7e1a91a..e74fc99 100644
> --- a/drivers/net/wireless/ath/ath9k/recv.c
> +++ b/drivers/net/wireless/ath/ath9k/recv.c
> @@ -1917,13 +1917,13 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
>  		if (sc->rx.frag) {
>  			int space = skb->len - skb_tailroom(hdr_skb);
>  
> -			sc->rx.frag = NULL;
> -
>  			if (pskb_expand_head(hdr_skb, 0, space, GFP_ATOMIC) < 0) {
>  				dev_kfree_skb(skb);
>  				goto requeue_drop_frag;
>  			}
>  
> +			sc->rx.frag = NULL;
> +
>  			skb_copy_from_linear_data(skb, skb_put(hdr_skb, skb->len),
>  						  skb->len);
>  			dev_kfree_skb_any(skb);
> 
> 
> 

-- 
John W. Linville		Someday the world will need a hero, and you
linville@...driver.com			might be all we have.  Be ready.
--
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