From nobody Tue Apr 05 23:02:32 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 8789A1A94232; Tue, 5 Apr 2022 23:02: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 4KY37r2jS3z3LwD; Tue, 5 Apr 2022 23:02:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649199752; 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=4KRgKI8TBmP4+aUWvawSgAtp99YWGIsWkdHb1h0KQ/Q=; b=yIFCqmrSuVMxRLs63it6phtqhkSWefMmdsDOtlr8ieox4IzyUD8P5XOpcTNAgVu8Q/bLwA H0MzI1fWr7vL8ae8XSKSVVynZkle4q1CucVPFHGO/ujREvH8gqobaF2fRTqubpOqHw2fYh SJNLs5anZ+FGkVKulpuBIEGmVIkXXCeezU5Tey/TMpl3bWVeQ/RweTVf/HSzI5F3JqJYpT DeJEzIEij5obc34wDeUDyR9WL5wD950g64PjB93u/JkhgU9Pg0FQF2zEwzRAqR9O2JShQ5 O2YR+tQ7CQOngjyVYsX6ZRZD2Cww1Ioqqfk/6+BG4qZ5OZSp1H4iykduzn5P4w== 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 3DD1578A3; Tue, 5 Apr 2022 23:02:32 +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 235N2WGX010414; Tue, 5 Apr 2022 23:02:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235N2Wel010413; Tue, 5 Apr 2022 23:02:32 GMT (envelope-from git) Date: Tue, 5 Apr 2022 23:02:32 GMT Message-Id: <202204052302.235N2Wel010413@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: e7c990ba3f8d - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: e7c990ba3f8de8c4882390cad9b01a9fa25ad068 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649199752; 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=4KRgKI8TBmP4+aUWvawSgAtp99YWGIsWkdHb1h0KQ/Q=; b=YS5nbyjs8l0sRhzVV6xhD3Y0Mqb7cvhpY9YiNgjmERQiaxy+2R1ZQSvzcSXwpwgxjBrpjo k195gIV6vnduv70il8asixjY4pT/Kfu6B2TIe8/qMdqo6ftjYTiuBKY/Rj4JoFrn3Xb31w 0tQ6+f9cmd6L8Aa907ZwrVQDThHWmEi1VJ6SulIDVv+S+T4bMJo6L1nURCpOE+n/aTV8lI BOcv3wakG7dv32tpWZ1xM4ZKjYESyDG1JK05O69SyGY1K4KTGKYJJgHqKFuhzhiCyJqrJX mrhvxVPgxUejlXoXBqEnEdwzqpk1OIBEQ3ldfKJl3LtxQw5ZVDRYb3hz+nTUTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649199752; a=rsa-sha256; cv=none; b=waYvilD2XoBZuzGAn8ZxodEUK6P9KbfGoraYXYSIbho70RgHS+r8aMDKknXXyFoQOlnwHT y8WWXk0/r91/bwn26QrrBQcmRFzKjXFYXsETQTSSDJ4jPA02u4P93ivec41zEpTrn01WUe UT4fNJG9AETzn0NxUCPOeWCdNEm0cZs2pnLkZqz6l63ymsyDv+29CjZox8roAmrdKXW8Wb 8lh9pkvgKQ43urD7XzWDJGkQT1tg3yITU8M7fe08CJyW02pM7gmcqeVNcrYudYxRrQvpPo o4oz1nwR8tO2Tzpa8xjkZ57xUeefX/wlJoTJGr/PNFaYQZyatyQO11m0R9hBXg== 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=e7c990ba3f8de8c4882390cad9b01a9fa25ad068 commit e7c990ba3f8de8c4882390cad9b01a9fa25ad068 Author: Bjoern A. Zeeb AuthorDate: 2022-04-05 22:52:51 +0000 Commit: Ed Maste CommitDate: 2022-04-05 23:00:46 +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) --- 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