From 0584d5a0f06066c7d7bf0c1b4aaa915b2293e4cd Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:30 +0100 Subject: [PATCH] Revert "wifi: cfg80211: fix two more possible UBSAN-detected off-by-one errors" This reverts commit d7f5363ee0f9ab74fdc2023ba7681903f9f425f5. --- net/wireless/nl80211.c | 3 +-- net/wireless/sme.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 0fc60a83d..22416141a 100755 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -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) diff --git a/net/wireless/sme.c b/net/wireless/sme.c index ae8ff2cdf..f7e2e172a 100755 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -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,