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

[ Upstream commit 15ea13b1b1fbf6364d4cd568e65e4c8479632999 ]

Although not reproduced in practice, these two cases may be
considered by UBSAN as off-by-one errors. So fix them in the
same way as in commit a26a5107bc52 ("wifi: cfg80211: fix UBSAN
noise in cfg80211_wext_siwscan()").

Fixes: 807f8a8c3004 ("cfg80211/nl80211: add support for scheduled scans")
Fixes: 5ba63533bbf6 ("cfg80211: fix alignment problem in scan request")
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Link: https://patch.msgid.link/20240909090806.1091956-1-dmantipov@yandex.ru
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 967bc4935b4ed9862adbaf79ae1af8b5cc8a7187..e3bf14e489c5de0c7edf817a6812e36ada7b360b 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -9658,7 +9658,8 @@ nl80211_parse_sched_scan(struct wiphy *wiphy, struct wireless_dev *wdev,
                return ERR_PTR(-ENOMEM);
 
        if (n_ssids)
-               request->ssids = (void *)&request->channels[n_channels];
+               request->ssids = (void *)request +
+                       struct_size(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 1cfe673bc52f373e5923bc04147b6ce09c6b6ac4..4b80af0edbe97655c4f98ea15de2e77ecdf31fe5 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -115,7 +115,8 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
                n_channels = i;
        }
        request->n_channels = n_channels;
-       request->ssids = (void *)&request->channels[n_channels];
+       request->ssids = (void *)request +
+               struct_size(request, channels, n_channels);
        request->n_ssids = 1;
 
        memcpy(request->ssids[0].ssid, wdev->conn->params.ssid,