Commit 15ea13b1 authored Sep 09, 2024 by Dmitry Antipov Committed by Johannes Berg Sep 09, 2024

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



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 a26a5107 ("wifi: cfg80211: fix UBSAN
noise in cfg80211_wext_siwscan()").

Fixes: 807f8a8c ("cfg80211/nl80211: add support for scheduled scans")
Fixes: 5ba63533 ("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>

parent 4e1b5586

net/wireless/nl80211.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -9778,7 +9778,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)

net/wireless/sme.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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,