From nobody Tue Mar 15 18:16:14 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 695041A24E33; Tue, 15 Mar 2022 18:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KJ1nC1Tqdz58fM; Tue, 15 Mar 2022 18:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647368175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fp/XOqgqRmvHPDatrgFkat+dkyR1RdWd16omgMI7LZc=; b=WYcXCwAmpvUPtbRONz2vS6frK1ibgwgGJxXe7ggCwAncSBThZaFsh/mCg6qWrL3kB7eGQ0 DnAYfSmXQ+WHhcOKUhantn9PKtsDRhg8KbRSTm/UGqrpaTKLvcsZ6vSW5S3lAaS42/pkqy VAk+L0b6cXI7g6ZPPKluXIvW+AxW9ajkZIDV25pJ+hFV3iLvbkU1xjPGSGjKF0PAKTP9Bo KLwRlcZMszf5g91gcYGzze/dxlKq3Orvp83mlhfuH67mpNIo/MoXJVKTHxQsF5fecG3FX3 KXEofnSuKj3uoUhMvuu6cPsyWOxc7fF30+AkRMJzCUlCZ/4ZnDF8iEgQWXmf8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A808266C3; Tue, 15 Mar 2022 18:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FIGEiS075615; Tue, 15 Mar 2022 18:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FIGEop075614; Tue, 15 Mar 2022 18:16:14 GMT (envelope-from git) Date: Tue, 15 Mar 2022 18:16:14 GMT Message-Id: <202203151816.22FIGEop075614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 46f1fb82372e - releng/12.3 - net80211: proper ssid length check in setmlme_assoc_adhoc() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.3 X-Git-Reftype: branch X-Git-Commit: 46f1fb82372e38a2e32bf47522cfe1f67de144b2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647368175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fp/XOqgqRmvHPDatrgFkat+dkyR1RdWd16omgMI7LZc=; b=EA/mLuk1qqlaZpycXVzrMpGhgSqkokzmDgkVs64YVsmvMXe1hzLjTN2PgGW74s/UNDcitb 3u6Vi7kiOiDdpL6bJ+MUXCgd4ZiVHXWjZoChBKDjN3xD6NIPyqgpy8iCpqoyZqFaKGaAnx pIoRPilhNxxwG/kANeRjRgUvSbf1Y/7FU6iH9EiLhl8ZSA7zMWBLPwd6SsHez3zyB/euJB oGiGjqCIx4AP3KSJrRDKwNvlYXSBEN3s1zbdA3M/4g0uiTSOwDHj5tOl+ZXRANHHVPFxlG tt8Ts+EBchAL8Rw44bolu3K4q5o7zNSjhfpl2Kqd5tZMmKwb4PxgavaMqU6FUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647368175; a=rsa-sha256; cv=none; b=sdH43RzmpynSXklckElvKWi3DTbDPJWaiIXSUjIF1RDeuj2tdoVZUixKbEhSOqdR4RhixT m3wypEqraqNxcRqE8yuscLOAmVKbXqOhPX+mYnc+NgCnwiATdjlLwzKnX7GevTogWOfUs9 FEgzRSROEu15Av/Tx/ZTY0XB9RiiMxRGLIRgHVe+VOhS0ldwE+U4NztvyL64S1uOU0tLIb d3tn9pT58iuTpEcFlqafsp+qSS1P3o5cRi84nxlm0BBh+o0PhLFQOEgFmhRcYWijOPj0+y vmXxZ/nhKhU3j63Kd7jjIW8s0RDXMQZc8gbjQHWgfrKRxhLcKmkArpUIM/wAtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=46f1fb82372e38a2e32bf47522cfe1f67de144b2 commit 46f1fb82372e38a2e32bf47522cfe1f67de144b2 Author: Bjoern A. Zeeb AuthorDate: 2021-10-06 18:41:37 +0000 Commit: Mark Johnston CommitDate: 2022-03-15 18:16:01 +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) (cherry picked from commit 526370fb85db4b659cff4625eb2f379acaa4a1a8) (cherry picked from commit 0525ece3554edce14fa68a7fb61078ae2110c44b) (cherry picked from commit ab5678c6c0d0b28feafdb2fd397866d6088f37d8) (cherry picked from commit f4d0e8787a09f4cdfb856924aaca97f1c78b65b1) Approved by: so Security: FreeBSD-SA-22:02.wifi --- 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 7e3a986e79f3..5ffa09f844c1 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 > IEEE80211_NWID_LEN) return EINVAL; sr = IEEE80211_MALLOC(sizeof(*sr), M_TEMP,