Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "wifi: cfg80211: fix two more possible UBSAN-detected off-by-one errors"

Browse source 
This reverts commit d7f5363ee0.
This commit is contained in:
Ksawlii 2024-11-24 00:23:30 +01:00
parent 6bafde029d
commit 0584d5a0f0
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/wireless/nl80211.c
View file

@ -8651,8 +8651,7 @@ nl80211_parse_sched_scan(struct wiphy *wiphy, struct wireless_dev *wdev,
return ERR_PTR(-ENOMEM);
if (n_ssids)
request->ssids = (void *)request +
struct_size(request, channels, n_channels);
request->ssids = (void *)&request->channels[n_channels];
request->n_ssids = n_ssids;
if (ie_len) {
if (n_ssids)

3
net/wireless/sme.c
View file

@ -116,8 +116,7 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
n_channels = i;
}
request->n_channels = n_channels;
request->ssids = (void *)request +
struct_size(request, channels, n_channels);
request->ssids = (void *)&request->channels[n_channels];
request->n_ssids = 1;
memcpy(request->ssids[0].ssid, wdev->conn->params.ssid,