Skip to content

Commit

Permalink
wifi: mac80211: do not abuse fq.lock in ieee80211_do_stop()
Browse files Browse the repository at this point in the history
lockdep complains use of uninitialized spinlock at ieee80211_do_stop() [1],
for commit f856373 ("wifi: mac80211: do not wake queues on a vif
that is being stopped") guards clear_bit() using fq.lock even before
fq_init() from ieee80211_txq_setup_flows() initializes this spinlock.

According to discussion [2], Toke was not happy with expanding usage of
fq.lock. Since __ieee80211_wake_txqs() is called under RCU read lock, we
can instead use synchronize_rcu() for flushing ieee80211_wake_txqs().

Link: https://syzkaller.appspot.com/bug?extid=eceab52db7c4b961e9d6 [1]
Link: https://lkml.kernel.org/r/[email protected] [2]
Reported-by: syzbot <[email protected]>
Signed-off-by: Tetsuo Handa <[email protected]>
Fixes: f856373 ("wifi: mac80211: do not wake queues on a vif that is being stopped")
Tested-by: syzbot <[email protected]>
Acked-by: Toke Høiland-Jørgensen <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
[ pick up commit 3598cb6 ("wifi: mac80211: do not abuse fq.lock in ieee80211_do_stop()") from -next]
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
Tetsuo Handa authored and kuba-moo committed Jul 26, 2022
1 parent 9b134b1 commit aa40d5a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do
bool cancel_scan;
struct cfg80211_nan_func *func;

spin_lock_bh(&local->fq.lock);
clear_bit(SDATA_STATE_RUNNING, &sdata->state);
spin_unlock_bh(&local->fq.lock);
synchronize_rcu(); /* flush _ieee80211_wake_txqs() */

cancel_scan = rcu_access_pointer(local->scan_sdata) == sdata;
if (cancel_scan)
Expand Down

0 comments on commit aa40d5a

Please sign in to comment.