From nobody Tue Feb 15 15:45:31 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 19732194CD9A; Tue, 15 Feb 2022 15:45:32 +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 4JylmD0FNkz3nHQ; Tue, 15 Feb 2022 15:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644939932; 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=aqTHoOWLdJlIdOLRbs3IqI5OIjUrNmKhxJkUxy2VWHY=; b=iPN7PN+7BFxtMCFFPPBllyEuLa0xnX7DDcrNEVJoNrf6Nr6+MtO9W/LqYn/qmu7Vev9ai0 pZlt+hJfUbChJXqwVeP5GtK4aVoYE1iHsig2+QOXsK3yVlxL49SMmE4uMuFRcRmVI9gPqV /sNDSJnE6g9br73T5OYIqaCh0NHX/CsIMLzMZ1bK24WGNZgGOEZKP67iENCgmxXMVhdIMW d8JKorNHucM2LdRCwl0KhyQ1hCZGu97fyJ85cYh1HD+eQ3vbJ1zIcw3C1XIGpJmR8ldpAN crhim6kVpwJtLBE2uNRtTvp8QcRoGKDW/rgmhXUyXynJh4Kl/EDvN5e4m2BD0w== 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 DD1CF24DF8; Tue, 15 Feb 2022 15:45:31 +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 21FFjVxI044457; Tue, 15 Feb 2022 15:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FFjV0h044456; Tue, 15 Feb 2022 15:45:31 GMT (envelope-from git) Date: Tue, 15 Feb 2022 15:45:31 GMT Message-Id: <202202151545.21FFjV0h044456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f4d0e8787a09 - stable/12 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f4d0e8787a09f4cdfb856924aaca97f1c78b65b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644939932; 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=aqTHoOWLdJlIdOLRbs3IqI5OIjUrNmKhxJkUxy2VWHY=; b=rU3kSoDTlagh68ItAbMAN9EBVVBiDcfqhs8EIFs4+4wsf6jijtHO836znBp4ypZRXGGb0J Xzm5GdigTiYESOhp1E76KXfYTfAog9nYDySm2IsrHwlq9nRBdwTkDzCZuivC+d06OUh5De PQzufda/wMsGbQIjhayBXV5m4BQe2netyVg+VX6V7zEDBFkbT0nfbA6ATq6e992wrwH6pB Vk/zF7gxNOmGyOZhK8ZZ40mZwCIO5PT1mMLViAbbt11NKqU8Oq9a79+oJfWEemUrNBgKah oknQU62wpMJ2oUfVHWIMt7R+jvkkqG00BD+29TUQ3MiTC+hSq8hqbc1zskL8iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644939932; a=rsa-sha256; cv=none; b=T5jKlpdQTAl9zuHcNxmmAn0LHYgvS5oX7iM3lR/GvOUEhe1kmjaP/CNiHFhAUk+o1eZCry oBpXotRDQ/bsSlcKznTbID5Pdqlmq42mlA8b4wBti61qfiEsIqsloPRq/oeFW5bLT5jj6N QT5Y84/joUAjDwaEPyykhaoVt/G2Q/cM4tk/kg/dinQMRV/T1fgHa5L26V9RXEEJt2T9QD SPXl50JNpUPZK30NDUEvTavXQPr2Yhk3D+ToqcIAMi8yTpbbX8YptbjP5MyiSZiBopne4G CcRBoaz93Jmy0FQEwjisavkNGRXW5hGIzDmPydNO/pmoeC1Pvde4djHdwoAyJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f4d0e8787a09f4cdfb856924aaca97f1c78b65b1 commit f4d0e8787a09f4cdfb856924aaca97f1c78b65b1 Author: Bjoern A. Zeeb AuthorDate: 2021-10-06 18:41:37 +0000 Commit: Ed Maste CommitDate: 2022-02-15 15:03:09 +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) --- 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,