From: Dave Jones <davej@redhat.com>
To: Arend van Spriel <arend@broadcom.com>
Cc: netdev@vger.kernel.org, linville@tuxdriver.com,
linux-coverity@vger.kernel.org
Subject: brcmfmac: fix skb leak in brcmf_sdio_txpkt_prep_sg error path.
Date: Thu, 6 Mar 2014 12:03:54 -0500 [thread overview]
Message-ID: <20140306170354.GA31372@redhat.com> (raw)
In-Reply-To: <53183722.7000301@broadcom.com>
Commit 1eb4301867 added an allocation of an skb via brcmu_pkt_buf_get_skb()
but forgot to free it on one of the error paths.
Cc: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Dave Jones <davej@fedoraproject.org>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 119ee6eaf1c3..ddaa9efd053d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -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);
next prev parent reply other threads:[~2014-03-06 17:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20140305192636.D06AA660D72@gitolite.kernel.org>
2014-03-06 6:09 ` brcmfmac: fix txglomming scatter-gather packet transfers Dave Jones
2014-03-06 8:51 ` Arend van Spriel
2014-03-06 17:03 ` Dave Jones [this message]
2014-03-06 21:41 ` brcmfmac: fix skb leak in brcmf_sdio_txpkt_prep_sg error path Sergei Shtylyov
2014-03-06 20:51 ` Dave Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140306170354.GA31372@redhat.com \
--to=davej@redhat.com \
--cc=arend@broadcom.com \
--cc=linux-coverity@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).