* [PATCH] mac80211: fix ieee80211_txq_setup_flows() failure path
@ 2019-11-05 14:41 Johannes Berg
2019-11-05 15:33 ` Toke Høiland-Jørgensen
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2019-11-05 14:41 UTC (permalink / raw)
To: linux-wireless; +Cc: Toke Høiland-Jørgensen, Johannes Berg
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(-)
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);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mac80211: fix ieee80211_txq_setup_flows() failure path
2019-11-05 14:41 [PATCH] mac80211: fix ieee80211_txq_setup_flows() failure path Johannes Berg
@ 2019-11-05 15:33 ` Toke Høiland-Jørgensen
0 siblings, 0 replies; 2+ messages in thread
From: Toke Høiland-Jørgensen @ 2019-11-05 15:33 UTC (permalink / raw)
To: Johannes Berg, linux-wireless; +Cc: Johannes Berg
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-05 15:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05 14:41 [PATCH] mac80211: fix ieee80211_txq_setup_flows() failure path Johannes Berg
2019-11-05 15:33 ` Toke Høiland-Jørgensen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).