From nobody Tue Apr 05 22:58:41 2022 X-Original-To: dev-commits-src-all@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 0DF351A91F76; Tue, 5 Apr 2022 22:58:42 +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 4KY33P6Mkcz3K8v; Tue, 5 Apr 2022 22:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649199521; 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=8YQl5T9MWV1E5hMw/qaNU6QfHbTKuodqp32C273l2Zc=; b=EoRBtHH57DeOJl5quUHCVSXBN6PKmarPXKqO/WrN3FbbW4s3LgnVRtROExSxjv8KSVqAKe oHfACvi9aHeP2PVXsL9It2VMBM7tR+CAHQeUWQp7zNLBVw2LYc1VTGktWaD8Flt00cNoXR ACq8DgH7HC0yB9m4ITtboC8YwTiE7X6QCjdovPnScxplbKRUXQTMigXTfjHyWG/YXV/QPA q1JuEJFwk9g1ZYbBK8MAw2JSfIgqUyYevC1w/q7J4qfvqIRwhi7KcPCiMy8Sj22SjPYDfI I8buxistgbCnAwxXNqmYAutwVxDi6YiUXtLcm1v5qDFk+pniEhsM9QtmM3C+8A== 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 BB44F7939; Tue, 5 Apr 2022 22:58:41 +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 235MwffL096409; Tue, 5 Apr 2022 22:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235Mwf2V096408; Tue, 5 Apr 2022 22:58:41 GMT (envelope-from git) Date: Tue, 5 Apr 2022 22:58:41 GMT Message-Id: <202204052258.235Mwf2V096408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fb8c87b4f3bf - main - net80211: validate Mesh ID length in ieee80211_parse_beacon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: fb8c87b4f3bfdfac014f9d894fe75fbad0391b24 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649199521; 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=8YQl5T9MWV1E5hMw/qaNU6QfHbTKuodqp32C273l2Zc=; b=oKjGhSQktASl42lYqbdpeTRmqOQq54FyuFlHIXpc2ONgq+ASG0rIXJn6N5wCcZbAves28+ 6h0KpQ4XD++0fUg6eRAYDUE1uje8Ock+SZHcL4QvL63MPwlG3oGg3nwVpuouzDDWfspHr1 6N7IQCirCkzO582eH6lzVmSm8U8HBiA7gIMTIiDQFH0+l/KLMM1tCWsYOsK4A3pM//RTdM o1+UzjR8nE96DT2wtkAWwGj7ZpV7Hjutm5EjqNoMNmBSwI5gJoU+DaHQkD3ErY1cgqjxSj mkq0C6KK4FqSSLv1fvIUh73YgANom4IVO5InyUeYbL50KNbUypHK6eZq4lGgLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649199521; a=rsa-sha256; cv=none; b=c22QYcDz8k8DWUGlaEHLQ7427ON3Sz4PL54KV6aJDT1FksXpALf15GBiXAP+80UvKW7Gnp D+DOredNz0RRww5NtRvesDL3sNYuPYxARtTmEaW9dMtVfCd3FR5+4rpNylfJKjmkfAFa5z 2oNMjcCmA3TKP2iZ0HKQI1YXdwGna6tQVXSa37sG68rvwdjD+j1Rdq/HE056OswzjGr7ZI Szqu6IIzLWo10nlIRo83CFoyBerAlr25LwRHfsP+8LsDzWm0uOU3kLbJ6z09CJNtkQfdQr g1SBt84YB9TFYLz9smH+fkDCXeQrAMEYfw6TpIjSPtPCAWpm8g1Efv+c9+KkaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fb8c87b4f3bfdfac014f9d894fe75fbad0391b24 commit fb8c87b4f3bfdfac014f9d894fe75fbad0391b24 Author: Bjoern A. Zeeb AuthorDate: 2022-04-05 22:58:28 +0000 Commit: Ed Maste CommitDate: 2022-04-05 22:58:28 +0000 net80211: validate Mesh ID length in ieee80211_parse_beacon Reported by: m00nbsd working with Trend Micro Zero Day Initiative --- 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 516de781e23e..7406c92d6d0e 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