Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1656610

[PATCH v2] brcmfmac: Fix glom_skb leak in brcmf_sdiod_recv_chain

Show all headers | View raw

An earlier change to this function (3bdae810721b) fixed a leak in the
case of an unsuccessful call to brcmf_sdiod_buffrw(). However, the
glom_skb buffer, used for emulating a scattering read, is never used
or referenced after its contents are copied into the destination
buffers, and therefore always needs to be freed by the end of the
function.

Fixes: 3bdae810721b ("brcmfmac: Fix glob_skb leak in brcmf_sdiod_recv_chain")
Fixes: a413e39a38573 ("brcmfmac: fix brcmf_sdcard_recv_chain() for host without sg support")
Signed-off-by: Peter S. Housel <housel@acm.org>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 9b970dc..30fb54e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -727,15 +727,13 @@ int brcmf_sdiod_recv_chain(struct brcmf_sdio_dev *sdiodev,
 			return -ENOMEM;
 		err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_2, false, addr,
 					 glom_skb);
-		if (err) {
-			brcmu_pkt_buf_free_skb(glom_skb);
-			goto done;
-		}
-
-		skb_queue_walk(pktq, skb) {
-			memcpy(skb->data, glom_skb->data, skb->len);
-			skb_pull(glom_skb, skb->len);
+		if (!err) {
+			skb_queue_walk(pktq, skb) {
+				memcpy(skb->data, glom_skb->data, skb->len);
+				skb_pull(glom_skb, skb->len);
+			}
 		}
+		brcmu_pkt_buf_free_skb(glom_skb);
 	} else
 		err = brcmf_sdiod_sglist_rw(sdiodev, SDIO_FUNC_2, false, addr,
 					    pktq);
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] brcmfmac: Fix glob_skb leak in brcmf_sdiod_recv_chain "Peter S. Housel" <housel@acm.org> - 2017-06-02 19:40 +0200
  Re: [PATCH] brcmfmac: Fix glob_skb leak in brcmf_sdiod_recv_chain Florian Fainelli <f.fainelli@gmail.com> - 2017-06-02 20:50 +0200
  Re: [PATCH] brcmfmac: Fix glob_skb leak in brcmf_sdiod_recv_chain Franky Lin <franky.lin@broadcom.com> - 2017-06-02 21:00 +0200
    [PATCH v2] brcmfmac: Fix glom_skb leak in brcmf_sdiod_recv_chain "Peter S. Housel" <housel@acm.org> - 2017-06-03 00:40 +0200
      Re: [PATCH v2] brcmfmac: Fix glom_skb leak in brcmf_sdiod_recv_chain Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-06-03 17:40 +0200
    Re: [PATCH] brcmfmac: Fix glob_skb leak in brcmf_sdiod_recv_chain Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-06-03 17:50 +0200

csiph-web