Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbf7f305 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

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: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 64e29e44

drivers/net/wireless/wl12xx/wl1271_tx.c

+7 −3
Original line number Diff line number Diff line
@@ -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))

		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;