From nobody Wed Apr 06 03:04:50 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 907971A8517D; Wed, 6 Apr 2022 03:04:51 +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 4KY8WQ6lpHz4dvX; Wed, 6 Apr 2022 03:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214291; 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=I5AEPhm107jMgu256MZ8KmmFt2ZJRFKZ7r6nMMIbEbY=; b=X7xdyjR5scs8/LFKe7+qesARLx7Dpp7Cc9qZ3K5nuBmZ2clQ7bmCLa8tx+7VN71M28PZD6 ZjfynZ4G3g+Lj8Kvn0ncjOVnyPpLeb4ZdaiCMg+ls1GNaFnlJgieaXiQpCQt0qdi8ZS7U5 eYjrHgWBsU5vkCZXQFv/aVqc7T7HMRz2Uh77TLDSXr97iCmzTcS5KAdZIMPRTupSjbxWyZ VIggpziGiHeUj9EBQoJjRZPvyK9DiDjsd+ixA5jCrWpk7dBG0Y3EwjEYmQFxbKGyuGhunx 4muaP/sQWtx7gFcfmzjYWx0LaZ1u4UBb3bSIUJNPXqDpkkR/3khxQGWVD5Gnqw== 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 61347133B9; Wed, 6 Apr 2022 03:04:50 +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 23634orZ035202; Wed, 6 Apr 2022 03:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23634ooQ035201; Wed, 6 Apr 2022 03:04:50 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:04:50 GMT Message-Id: <202204060304.23634ooQ035201@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: 87099980a00c - releng/12.3 - 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/12.3 X-Git-Reftype: branch X-Git-Commit: 87099980a00cc6d785883214bb89df26490c5379 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214291; 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=I5AEPhm107jMgu256MZ8KmmFt2ZJRFKZ7r6nMMIbEbY=; b=gnrIfQgu4LTiYNoFe5MY3av+9dYemo6r4bzcrMSyVfPS4JoGHiBaOFYiqHkKDL3G0jtfC2 Dc1dpxlRHOkJnH3kr+RrWXLJci0u2W2eecqPexhA5LsDzaU4inVAIZiGespX+hrG5VKK8e gSDsBaxQLJGH2NMWjSsJpluUZ+OLpJGLSIiyoTSoIB5XW/C5NBDK67X3LOtm4ivF5CWOLL uJGQ3eaQQE5v90hzUW7a6/En3iUpzu9y+QBjMFzhaXHznsxpL9vS8iMb6nRd0ju9AmNZYl f/rycAgVMJtZM3XG0lPEb26nDprcEbIr4Gplr7UQQjudz0R3PVI9runNCySfsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649214291; a=rsa-sha256; cv=none; b=cV3SXpOUnBNmRhAdx+1GgUH8DugoitxDukdpPC+scHOJdyd1gnAYiHNzhbRcpEKm3EShXL lwIq/D1x8CYW5IsuCs97V1F4T0Zeokjkz8I2w1yTLf+MJ3xwyjVKIaOaprqcJgvW/HWghv D6nCTKap+34VOkwoR3q1H6kF46FikQrhwl8JNsLEQyrLSw3kVmEWCqQQUfMfqSxRvXpqRL IbOYSKczRCQGBPzAt8UNv+zpXPDjLoKErVrI7D2LA3uFb4JTRVi7tqCbaOr45XL3a0Mjgv Ci1a53LByAUTIMA6iqf1z0V6wbAch6FKeixUXnuO++xaKzbGmni6X7ei30lTVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.3 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=87099980a00cc6d785883214bb89df26490c5379 commit 87099980a00cc6d785883214bb89df26490c5379 Author: Bjoern A. Zeeb AuthorDate: 2022-04-05 23:21:44 +0000 Commit: Ed Maste CommitDate: 2022-04-05 23:29:29 +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) (cherry picked from commit 8373df6aa0acc70343864075b08507ccea24aa5d) 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 5b2d2c15cc12..eaafe9e5c326 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