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

Commit d4fa14cd authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

mac80211: use ieee80211_free_txskb in a few more places 



Free tx status skbs when draining power save buffers, pending frames, or
when tearing down a vif.
Fixes remaining conditions that can lead to hostapd/wpa_supplicant hangs when
running out of socket write memory.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3e4f319d

net/mac80211/iface.c

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
			struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

			if (info->control.vif == &sdata->vif) {

				__skb_unlink(skb, &local->pending[i]);

				dev_kfree_skb_irq(skb);

				ieee80211_free_txskb(&local->hw, skb);

			}

		}

	}

net/mac80211/sta_info.c

+2 −2
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local, 
		 */

		if (!skb)

			break;

		dev_kfree_skb(skb);

		ieee80211_free_txskb(&local->hw, skb);

	}



	/*
@@ -679,7 +679,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local, 
		local->total_ps_buffered--;

		ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n",

		       sta->sta.addr);

		dev_kfree_skb(skb);

		ieee80211_free_txskb(&local->hw, skb);

	}



	/*

net/mac80211/util.c

+2 −2
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local, 
	int queue = info->hw_queue;



	if (WARN_ON(!info->control.vif)) {

		kfree_skb(skb);

		ieee80211_free_txskb(&local->hw, skb);

		return;

	}
@@ -431,7 +431,7 @@ void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, 
		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



		if (WARN_ON(!info->control.vif)) {

			kfree_skb(skb);

			ieee80211_free_txskb(&local->hw, skb);

			continue;

		}