Commit b5447ff9 authored Mar 15, 2012 by Eric Dumazet Committed by John W. Linville Mar 26, 2012

ath9k: fix a memory leak in ath_rx_tasklet()



commit 0d95521e (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@gmail.com>
Cc: Jouni Malinen <jouni@qca.qualcomm.com>
Cc: Felix Fietkau <nbd@openwrt.org>
Cc: John W. Linville <linville@tuxdriver.com>
Cc: Trond Wuellner <trond@chromium.org>
Cc: Grant Grundler <grundler@chromium.org>
Cc: Paul Stewart <pstew@chromium.org>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 195ca3b1

drivers/net/wireless/ath/ath9k/recv.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1913,13 +1913,13 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
	if (sc->rx.frag) {		if (sc->rx.frag) {
	int space = skb->len - skb_tailroom(hdr_skb);		int space = skb->len - skb_tailroom(hdr_skb);

	sc->rx.frag = NULL;

	if (pskb_expand_head(hdr_skb, 0, space, GFP_ATOMIC) < 0) {		if (pskb_expand_head(hdr_skb, 0, space, GFP_ATOMIC) < 0) {
	dev_kfree_skb(skb);		dev_kfree_skb(skb);
	goto requeue_drop_frag;		goto requeue_drop_frag;
	}		}

			sc->rx.frag = NULL;

	skb_copy_from_linear_data(skb, skb_put(hdr_skb, skb->len),		skb_copy_from_linear_data(skb, skb_put(hdr_skb, skb->len),
	skb->len);		skb->len);
	dev_kfree_skb_any(skb);		dev_kfree_skb_any(skb);