wl1271: Fix memory leak in firmware crash scenario
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>
Fri, 26 Mar 2010 10:53:27 +0000 (12:53 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 31 Mar 2010 18:39:15 +0000 (14:39 -0400)
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>
drivers/net/wireless/wl12xx/wl1271_tx.c

index 5712489f5ddb49c759d0aab451d0288050201723..66b48b70444eaa2abbe44f212bd1fd6a83425e76 100644 (file)
@@ -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;