diff options
| author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2022-07-17 21:21:52 +0900 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-07-18 15:01:14 +0300 |
| commit | 3598cb6e18626d28d20c8de4ee8217fdd4153d63 (patch) | |
| tree | ee18f0a6e77d37f73c0ceba6b0214ae1c90c20bc | |
| parent | bcfd9d7f6840b06d5988c7141127795cf405805e (diff) | |
| download | linux-stable-3598cb6e18626d28d20c8de4ee8217fdd4153d63.tar.gz linux-stable-3598cb6e18626d28d20c8de4ee8217fdd4153d63.tar.bz2 linux-stable-3598cb6e18626d28d20c8de4ee8217fdd4153d63.zip | |
wifi: mac80211: do not abuse fq.lock in ieee80211_do_stop()
lockdep complains use of uninitialized spinlock at ieee80211_do_stop() [1],
for commit f856373e2f31ffd3 ("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/874k0zowh2.fsf@toke.dk [2]
Reported-by: syzbot <syzbot+eceab52db7c4b961e9d6@syzkaller.appspotmail.com>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Fixes: f856373e2f31ffd3 ("wifi: mac80211: do not wake queues on a vif that is being stopped")
Tested-by: syzbot <syzbot+eceab52db7c4b961e9d6@syzkaller.appspotmail.com>
Acked-by: Toke Høiland-Jørgensen <toke@kernel.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/9cc9b81d-75a3-3925-b612-9d0ad3cab82b@I-love.SAKURA.ne.jp
| -rw-r--r-- | net/mac80211/iface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 3d485835dec2..bf3bc43411ac 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -590,9 +590,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) |