diff mbox series

mac80211: fix ieee80211_txq_setup_flows() failure path

Message ID 20191105154110.1ccf7112ba5d.I0ba865792446d051867b33153be65ce6b063d98c@changeid (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show
Series mac80211: fix ieee80211_txq_setup_flows() failure path | expand

Commit Message

Johannes Berg Nov. 5, 2019, 2:41 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

If ieee80211_txq_setup_flows() fails, we don't clean up LED
state properly, leading to crashes later on, fix that.

Fixes: dc8b274f0952 ("mac80211: Move up init of TXQs")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/mac80211/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Toke Høiland-Jørgensen Nov. 5, 2019, 3:33 p.m. UTC | #1 
Johannes Berg <johannes@sipsolutions.net> writes:

> From: Johannes Berg <johannes.berg@intel.com>
>
> If ieee80211_txq_setup_flows() fails, we don't clean up LED
> state properly, leading to crashes later on, fix that.
>
> Fixes: dc8b274f0952 ("mac80211: Move up init of TXQs")
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Oops, my bad; thanks for the fix!

Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
diff mbox series

Patch

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index aba094b4ccfc..2d05c4cfaf6d 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1292,8 +1292,8 @@  int ieee80211_register_hw(struct ieee80211_hw *hw)
 	ieee80211_remove_interfaces(local);
  fail_rate:
 	rtnl_unlock();
-	ieee80211_led_exit(local);
  fail_flows:
+	ieee80211_led_exit(local);
 	destroy_workqueue(local->workqueue);
  fail_workqueue:
 	wiphy_unregister(local->hw.wiphy);