diff options
author | Johannes Berg <johannes.berg@intel.com> | 2022-05-05 23:04:22 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2022-05-09 14:00:07 +0200 |
commit | 9e2db50f1ef2238fc2f71c5de1c0418b7a5b0ea2 (patch) | |
tree | 1f2ce63ed6ae69ae238b5cf37615a8e1e6314f58 /drivers | |
parent | a59d55568d02bbbdf9c0cc15be9580180f855b4f (diff) | |
download | linux-stable-9e2db50f1ef2238fc2f71c5de1c0418b7a5b0ea2.tar.gz linux-stable-9e2db50f1ef2238fc2f71c5de1c0418b7a5b0ea2.tar.bz2 linux-stable-9e2db50f1ef2238fc2f71c5de1c0418b7a5b0ea2.zip |
mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection
This is needed since it might use (and pass out) pointers to
e.g. keys protected by RCU. Can't really happen here as the
frames aren't encrypted, but we need to still adhere to the
rules.
Fixes: cacfddf82baf ("mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20220505230421.5f139f9de173.I77ae111a28f7c0e9fd1ebcee7f39dbec5c606770@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 3ac3693dbecb..e9ec63e0e395 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2478,11 +2478,13 @@ static void hw_scan_work(struct work_struct *work) if (req->ie_len) skb_put_data(probe, req->ie, req->ie_len); + rcu_read_lock(); if (!ieee80211_tx_prepare_skb(hwsim->hw, hwsim->hw_scan_vif, probe, hwsim->tmp_chan->band, NULL)) { + rcu_read_unlock(); kfree_skb(probe); continue; } @@ -2490,6 +2492,7 @@ static void hw_scan_work(struct work_struct *work) local_bh_disable(); mac80211_hwsim_tx_frame(hwsim->hw, probe, hwsim->tmp_chan); + rcu_read_unlock(); local_bh_enable(); } } |