2019-11-05 14:42:24

by Johannes Berg

Subject: [PATCH] mac80211: fix ieee80211_txq_setup_flows() failure path

From: Johannes Berg <[email protected]>

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 <[email protected]>
---
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

2019-11-05 15:40:48

by Toke Høiland-Jørgensen

Subject: Re: [PATCH] mac80211: fix ieee80211_txq_setup_flows() failure path

Johannes Berg <[email protected]> writes:

> From: Johannes Berg <[email protected]>
>
> 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 <[email protected]>

Oops, my bad; thanks for the fix!

Acked-by: Toke Høiland-Jørgensen <[email protected]>