From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Fri, 26 Mar 2010 10:53:27 +0000 (+0200)
Subject: wl1271: Fix memory leak in firmware crash scenario
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cbf7f3058ea17d9413a6889c3a229e8eac7a7c78;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

wl1271: Fix memory leak in firmware crash scenario

The driver tx-queue flush operation leaks broadcast-frames. This leak occurs
if the driver is shut down while there are frames in TX buffers (such as in
a firmware crash scenario.) Fix the leak.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index 5712489f5dd..66b48b70444 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -426,8 +426,10 @@ void wl1271_tx_flush(struct wl1271 *wl)
 
 		wl1271_debug(DEBUG_TX, "flushing skb 0x%p", skb);
 
-		if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS))
-				continue;
+		if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {
+			kfree_skb(skb);
+			continue;
+		}
 
 		ieee80211_tx_status(wl->hw, skb);
 	}
@@ -437,8 +439,10 @@ void wl1271_tx_flush(struct wl1271 *wl)
 			skb = wl->tx_frames[i];
 			info = IEEE80211_SKB_CB(skb);
 
-			if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS))
+			if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {
+				kfree_skb(skb);
 				continue;
+			}
 
 			ieee80211_tx_status(wl->hw, skb);
 			wl->tx_frames[i] = NULL;