github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 02:24:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: cfg80211/mac80211: remove wrong scan request n_channels

Browse Source 
This (partially) reverts commits
 - 838c7b8f1f ("wifi: nl80211: Avoid address calculations via out of bounds array indexing")
 - f1d3334d60 ("wifi: cfg80211: sme: init n_channels before channels[] access")
 - 82bbe02b25 ("wifi: mac80211: Set n_channels after allocating struct cfg80211_scan_request")

These commits all set the structure to be in an inconsistent
state, setting n_channels to some value before them actually
being filled in. That's fine for what the code does now, but
with the removal of __counted_by() in 444020f4bf ("wifi:
cfg80211: remove scan request n_channels counted_by") it's no
longer needed and it does leave a bit of a landmine there
since breaking out of some code to send the scan or something
would leave it wrong.

Remove the now superfluous n_channels settings.

Link: https://patch.msgid.link/20250718103237.59510b2384c5.Ied5ba9c5c49efc008f4491c8ca7a45858a83f064@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2025-07-18 10:32:36 +02:00
parent 18b3246dbf
commit 765e98e918
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/main.c
View File

@ -1334,7 +1334,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
GFP_KERNEL);
if (!local->int_scan_req)
return -ENOMEM;
local->int_scan_req->n_channels = channels;
eth_broadcast_addr(local->int_scan_req->bssid);

1
net/wireless/nl80211.c
View File

@ -9975,7 +9975,6 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
request = kzalloc(size, GFP_KERNEL);
if (!request)
return -ENOMEM;
request->req.n_channels = n_channels;
if (n_ssids)
request->req.ssids = (void *)request + ssids_offset;

1
net/wireless/sme.c
View File

@ -83,7 +83,6 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
if (!request)
return -ENOMEM;
request->req.n_channels = n_channels;
if (wdev->conn->params.channel) {
enum nl80211_band band = wdev->conn->params.channel->band;
struct ieee80211_supported_band *sband =