brcmfmac: fix skb leak in brcmf_sdio_txpkt_prep_sg error path.
authorDave Jones <davej@redhat.com>
Thu, 6 Mar 2014 20:51:08 +0000 (15:51 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Mar 2014 18:57:26 +0000 (14:57 -0400)
Commit 1eb4301867 (brcmfmac: fix txglomming scatter-gather packet transfers)
added an allocation of an skb via brcmu_pkt_buf_get_skb() but forgot to
free it on one of the error paths.

Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Dave Jones<davej@fedoraproject.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

index 119ee6eaf1c3df944b6482957be5350220433753..ddaa9efd053df3a61e404ca96c60cd82dad3f0f2 100644 (file)
@@ -1948,8 +1948,10 @@ static int brcmf_sdio_txpkt_prep_sg(struct brcmf_sdio *bus,
                if (pkt_pad == NULL)
                        return -ENOMEM;
                ret = brcmf_sdio_txpkt_hdalign(bus, pkt_pad);
-               if (unlikely(ret < 0))
+               if (unlikely(ret < 0)) {
+                       kfree_skb(pkt_pad);
                        return ret;
+               }
                memcpy(pkt_pad->data,
                       pkt->data + pkt->len - tail_chop,
                       tail_chop);