From nobody Wed Apr 06 03:04:17 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 C1CD11A84811; Wed, 6 Apr 2022 03:04:18 +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 4KY8Vn5BLnz4dc1; Wed, 6 Apr 2022 03:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214258; 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=3wfytY7b+C5+6wo9B34SDZbb3w34DH+qlN+TpGEVY1A=; b=fw/4zOXOngU0NFa+ITeaD7Vj9y5xThAE5y9/F4JDzNt/SFJnzDuQ61vYpycm2ElV9t6hqe 4xZmLcUmw6E3RcQbViVmQ4YVqBNXIxsOy9YXXw6R7Z/sLFRq8pt0x3qUvPDItKqDy3qNgx GbmPcp41edmJdCk8nbBO0LgfFFpWyfKhRB2Laf2l5ZJBfhsbVLTtg1VuHU8+akJ5IznszG ge5SlN49ChYQJPdvFdL7XwqN2icpMwPCPUwqoWbaXe7RobXVxUjcdOr37AJbozCLJ7GVxq VWTBHb8w0X8Qsb6ihdG/i7p2xk2Zu3B8gjUiCPqFhnHlOyYoE4l5t0TnGKp9GA== 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 6915113450; Wed, 6 Apr 2022 03:04:17 +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 23634HIB034814; Wed, 6 Apr 2022 03:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23634H1v034813; Wed, 6 Apr 2022 03:04:17 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:04:17 GMT Message-Id: <202204060304.23634H1v034813@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: b2b23824272d - releng/13.0 - net80211: validate Mesh ID length in ieee80211_parse_beacon 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/releng/13.0 X-Git-Reftype: branch X-Git-Commit: b2b23824272dbfbdc99a51237bdeea0216184b81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214258; 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=3wfytY7b+C5+6wo9B34SDZbb3w34DH+qlN+TpGEVY1A=; b=WvLrU+xzxoy9kFiTrDAQ8xrX4ENXG+hRx7y0WDeu/xeXxBG6NS6N83AwL1iJir3jvpkVP/ 2+ubMhRZPIYqD+SWm/BQCKPuD0nPOFoPTcWbbpNfwTl+tL+HZcfWES+RTdRzEaswVI8sX5 xnglO0S2hqdwdMgsXyCwEufTlZ4Dzjx+3oZKaDHvY53sGmORHf1Jegd5LoyvtLYk/lsNqG OcZVEJxMKjrzrNnBOaEPzTsPz/6DCPxdtOh5GLEGH3fAVtwF1dBP76i/nJZvAhyjx/Q5PD Nhq5l4FDXUzerKrmReAaMLbIlS/xGeEoFXs6thOXGvpJKeCqeAIZ0DJnfVyL6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649214258; a=rsa-sha256; cv=none; b=t/C8GqJXQShkioPmhhv5CKSfw3zlCgldy9jtc6aXIvULJxnAcPXwhaXH1nDGG086EBG/Vt nn7Dj054/53kEXYb6e9pnnKaE5+Nu6OHhz6Hf7snerBNTpETJtPsLMmcSqfHGDKmW79tQ3 OwXmBDYoyGKYPoCdKbsBub71yBFOLuriNFXhheSSwNkoICzWSJlDjjOuneO62CFm+E3vBk MRigkXhM/cRI9wCG/MgTJGzsVdfh5QXp9nBy5Tw9a8UEG81JTXrrJqJkUocW2Ymlsj25P+ W1ogY8LZBTxM6JUCTML5POTHhLna6n+A6a43TMOVK7WVuT4biBFRfk7v9SR+YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b2b23824272dbfbdc99a51237bdeea0216184b81 commit b2b23824272dbfbdc99a51237bdeea0216184b81 Author: Bjoern A. Zeeb AuthorDate: 2022-04-05 23:27:00 +0000 Commit: Ed Maste CommitDate: 2022-04-05 23:27:01 +0000 net80211: validate Mesh ID length in ieee80211_parse_beacon Reported by: m00nbsd working with Trend Micro Zero Day Initiative (cherry picked from commit fb8c87b4f3bfdfac014f9d894fe75fbad0391b24) (cherry picked from commit 72617f9246e3a4be28eeafeae1bdd983143eef3e) Approved by: so Security: CVE-2022-23088 Security: FreeBSD-SA-22:07.wifi_meshid --- sys/net80211/ieee80211_input.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 66a5ba1c4035..2601b4cb9e63 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -742,6 +742,12 @@ ieee80211_parse_beacon(struct ieee80211_node *ni, struct mbuf *m, IEEE80211_VERIFY_LENGTH(scan->csa[1], 3 * sizeof(uint8_t), scan->status |= IEEE80211_BPARSE_CSA_INVALID); } +#ifdef IEEE80211_SUPPORT_MESH + if (scan->meshid != NULL) { + IEEE80211_VERIFY_ELEMENT(scan->meshid, IEEE80211_MESHID_LEN, + scan->status |= IEEE80211_BPARSE_RATES_INVALID); + } +#endif /* * Process HT ie's. This is complicated by our * accepting both the standard ie's and the pre-draft