Skip to content

Commit cacfddf

Browse files
k311093jmberg-intel
authored andcommitted
mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
In mac80211_hwsim, the probe_req frame is created and sent while scanning. It is sent with ieee80211_tx_info which is not initialized. Uninitialized ieee80211_tx_info can cause problems when using mac80211_hwsim with wmediumd. wmediumd checks the tx_rates field of ieee80211_tx_info and doesn't relay probe_req frame to other clients even if it is a broadcasting message. Call ieee80211_tx_prepare_skb() to initialize ieee80211_tx_info for the probe_req that is created by hw_scan_work in mac80211_hwsim. Signed-off-by: JaeMan Park <jaeman@google.com> Link: https://lore.kernel.org/r/20220113060235.546107-1-jaeman@google.com [fix memory leak] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 42a7996 commit cacfddf

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

drivers/net/wireless/mac80211_hwsim.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2336,6 +2336,15 @@ static void hw_scan_work(struct work_struct *work)
23362336
if (req->ie_len)
23372337
skb_put_data(probe, req->ie, req->ie_len);
23382338

2339+
if (!ieee80211_tx_prepare_skb(hwsim->hw,
2340+
hwsim->hw_scan_vif,
2341+
probe,
2342+
hwsim->tmp_chan->band,
2343+
NULL)) {
2344+
kfree_skb(probe);
2345+
continue;
2346+
}
2347+
23392348
local_bh_disable();
23402349
mac80211_hwsim_tx_frame(hwsim->hw, probe,
23412350
hwsim->tmp_chan);

0 commit comments

Comments
 (0)