| Message ID | 20240909090806.1091956-1-dmantipov@yandex.ru |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] wifi: cfg80211: fix two more possible UBSAN-detected off-by-one errors | expand |
On Mon, Sep 09, 2024 at 12:08:06PM +0300, Dmitry Antipov wrote: > 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> Thanks for finding these! Reviewed-by: Kees Cook <kees@kernel.org>
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 8bad3c6db39d..9ab777e0bd4d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -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) diff --git a/net/wireless/sme.c b/net/wireless/sme.c index d9d7bf8bb5c1..431da30817a6 100644 --- 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,
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> --- v2: fix title prefix as noticed by Kalle --- net/wireless/nl80211.c | 3 ++- net/wireless/sme.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)