[PATCH 3.12 62/84] brcmsmac: Free packet if dma_mapping_error() fails in dma_rxfill

From	Jiri Slaby <jslaby@suse.cz>
Newsgroups	linux.kernel
Subject	[PATCH 3.12 62/84] brcmsmac: Free packet if dma_mapping_error() fails in dma_rxfill
Date	2016-10-17 10:10 +0200
Message-ID	<stb9D-Tq-7@gated-at.bofh.it> (permalink)
References	<staZY-A3-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Florian Fainelli <f.fainelli@gmail.com>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit 5c5fa1f464ac954982df1d96b9f9a5103d21aedd upstream.

In case dma_mapping_error() returns an error in dma_rxfill, we would be
leaking a packet that we allocated with brcmu_pkt_buf_get_skb().

Reported-by: coverity (CID 1081819)
Fixes: 67d0cf50bd32 ("brcmsmac: Fix WARNING caused by lack of calls to dma_mapping_error()")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/net/wireless/brcm80211/brcmsmac/dma.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index 4fb9635d3919..7660b523dcf1 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -1079,8 +1079,10 @@ bool dma_rxfill(struct dma_pub *pub)
 
 		pa = dma_map_single(di->dmadev, p->data, di->rxbufsize,
 				    DMA_FROM_DEVICE);
-		if (dma_mapping_error(di->dmadev, pa))
+		if (dma_mapping_error(di->dmadev, pa)) {
+			brcmu_pkt_buf_free_skb(p);
 			return false;
+		}
 
 		/* save the free packet pointer */
 		di->rxp[rxout] = p;
-- 
2.10.1

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

Thread

[PATCH 3.12 62/84] brcmsmac: Free packet if dma_mapping_error() fails in dma_rxfill Jiri Slaby <jslaby@suse.cz> - 2016-10-17 10:10 +0200

csiph-web