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

Revert "wifi: cfg80211: fix UBSAN noise in cfg80211_wext_siwscan()"

Browse source 
This reverts commit 26dc7df8fb.
This commit is contained in:
Ksawlii 2024-11-24 00:23:30 +01:00
parent 13ab2b7319
commit 8b8bebf286
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/wireless/scan.c
View file

@ -2802,8 +2802,8 @@ int cfg80211_wext_siwscan(struct net_device *dev,
n_channels = ieee80211_get_num_supported_channels(wiphy); n_channels = ieee80211_get_num_supported_channels(wiphy);
} }
creq = kzalloc(struct_size(creq, channels, n_channels) + creq = kzalloc(sizeof(*creq) + sizeof(struct cfg80211_ssid) +
sizeof(struct cfg80211_ssid), n_channels * sizeof(void *),
GFP_ATOMIC); GFP_ATOMIC);
if (!creq) { if (!creq) {
err = -ENOMEM; err = -ENOMEM;
@ -2813,7 +2813,7 @@ int cfg80211_wext_siwscan(struct net_device *dev,
creq->wiphy = wiphy; creq->wiphy = wiphy;
creq->wdev = dev->ieee80211_ptr; creq->wdev = dev->ieee80211_ptr;
/* SSIDs come after channels */ /* SSIDs come after channels */
creq->ssids = (void *)creq + struct_size(creq, channels, n_channels); creq->ssids = (void *)&creq->channels[n_channels];
creq->n_channels = n_channels; creq->n_channels = n_channels;
creq->n_ssids = 1; creq->n_ssids = 1;
creq->scan_start = jiffies; creq->scan_start = jiffies;