The branch main has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=526370fb85db4b659cff4625eb2f379acaa4a1a8
commit 526370fb85db4b659cff4625eb2f379acaa4a1a8
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2021-10-06 18:41:37 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2021-10-08 10:23:31 +0000
net80211: proper ssid length check in setmlme_assoc_adhoc()
A user supplied SSID length is used without proper checks in
setmlme_assoc_adhoc() which can lead to copies beyond the end
of the user supplied buffer.
The ssid is a fixed size array for the ioctl and the argument
to setmlme_assoc_adhoc().
In addition to an ssid_len check of 0 also error in case the
ssid_len is larger than the size of the ssid array to prevent
problems.
PR: 254737
Reported by: Tommaso (cutesmilee.research protonmail.com)
MFC after: 3 days
Reviewed by: emaste, adrian
Differential Revision: https://reviews.freebsd.org/D32341
---
sys/net80211/ieee80211_ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 2fef9ac0084a..b0339d996999 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -1591,7 +1591,7 @@ setmlme_assoc_adhoc(struct ieee80211vap *vap,
("expected opmode IBSS or AHDEMO not %s",
ieee80211_opmode_name[vap->iv_opmode]));
- if (ssid_len == 0)
+ if (ssid_len == 0 || ssid_len > sizeof(ssid))
return EINVAL;
sr = IEEE80211_MALLOC(sizeof(*sr), M_TEMP,
