From nobody Thu Apr 07 20:55:19 2022 X-Original-To: dev-commits-src-main@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 95E821A9DE57; Thu, 7 Apr 2022 20:55:19 +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 4KZDD73n7Sz3Qvp; Thu, 7 Apr 2022 20:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649364919; 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=P7Ai12HiwDutP7yClwsa5asWAU1Xl0XC1xlt/I1l1fk=; b=u4kgZgUqkkIj6NHU5OS80TE7BsweowWbFjuxFPwufdy5f7udFdoa+9CRtWUWukgE7uqe8W bXKGnNtkdqJoN1QHHdwKpbDgBE7mL0s3C6qXwCQXDGAF1FhowRz424ntGs2pcyUBoEsXtV J1oOzYOt9NWZh42eNlriXtrKDIbCfTr2BUjMLgMqaoxH5EwqmMsrkGXVV+YqARzyphqheE mC32aKAGrrRJzuLHEtcz+6xjXhkxJro20kX1FY4xFU3BoA3vl4uNPfkFCqfG8JYWcB108E t7bicdJANxO70wOq+SyxWYMAXzuqUKCYKoXBrKI7uW1I9JAVHplpj2EAlvHKeg== 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 60F31178FC; Thu, 7 Apr 2022 20:55:19 +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 237KtJp7028108; Thu, 7 Apr 2022 20:55:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 237KtJQ2028107; Thu, 7 Apr 2022 20:55:19 GMT (envelope-from git) Date: Thu, 7 Apr 2022 20:55:19 GMT Message-Id: <202204072055.237KtJQ2028107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7354782698f1 - main - net80211: improve error handling from ieee80211_parse_beacon() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7354782698f1cf5d6b368a9b1e65cfe3ee7f235c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649364919; 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=P7Ai12HiwDutP7yClwsa5asWAU1Xl0XC1xlt/I1l1fk=; b=x3qEoKzGWW6U5OV5f4gj16/+GAJ4KC1LrOyWFTuEZQTNhGXwk2GGzYnmxoOXbAGuQ1ibW4 VAuNLFAWcs4y0aiVJ4tJUOyJjJBSa8Pgs+81zG08kSM9AkQJ8CqwpdtsV6xlfF1M/OZKKs wNOBoqfyLt810/JBwQ8Fp4W76fGhr2Xcb6HPZXt5RNL1xrNgihpQrHicRN09rUKDYoPSDK vgiJuL101RNP9ZUoogcn9wJ4sCRHrgLIk4JSTcyCRtCabe+XS/yJ4BSzFzt5XoPg2L/eap BAghqll/OvEQSieE08C8xCKlYMAySJg911wFunP9aby2H1t5S5L2MOtbPWmVYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649364919; a=rsa-sha256; cv=none; b=fGWYpPAOi4LGO+iD4ayrye8wInClMd4cYK7rfxtqgj7mCV1IqgxDNWfrupgwJ/fdccjOlt chAHjNezkrXvciqYx8Pl3rgkgJC+/V0P1zTyrfRkvzvZeEI40pYysVMG0qQ5+B1g25WeDS J3tW/ktBY3447Qw0MXZzq/2uJmT99eZWEnJ8hKSszl+Xc/9LxQvBiAnVkxRfyhN//Y86Ta IMiJV9jC1Z221aTzWrK9X2MxL89rEG1ggK4meZhycyK3dTEAz8R7GnS0PZHjZ+Y2rufhmr /yNnh7lwhd4rO83oeqNrLoQSQoYkqLp2As4qL+MAgvjVIWuzfY8khSby7PLFvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7354782698f1cf5d6b368a9b1e65cfe3ee7f235c commit 7354782698f1cf5d6b368a9b1e65cfe3ee7f235c Author: Bjoern A. Zeeb AuthorDate: 2022-04-07 20:50:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-04-07 20:50:39 +0000 net80211: improve error handling from ieee80211_parse_beacon() Following up on fb8c87b4f3bfdfac014f9d894fe75fbad0391b24, which was supposed to go into all supported branches, increase ieee80211_scanparams status field from 8bit to 32bit (enum size) and add a dedicated error code for Mesh ID. Sponsored by: The FreeBSD Foundation --- sys/net80211/ieee80211_input.c | 2 +- sys/net80211/ieee80211_scan.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 7406c92d6d0e..683c8d5a06f1 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -745,7 +745,7 @@ ieee80211_parse_beacon(struct ieee80211_node *ni, struct mbuf *m, #ifdef IEEE80211_SUPPORT_MESH if (scan->meshid != NULL) { IEEE80211_VERIFY_ELEMENT(scan->meshid, IEEE80211_MESHID_LEN, - scan->status |= IEEE80211_BPARSE_RATES_INVALID); + scan->status |= IEEE80211_BPARSE_MESHID_INVALID); } #endif /* diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h index 07d927cfa1e1..e1f7b786be19 100644 --- a/sys/net80211/ieee80211_scan.h +++ b/sys/net80211/ieee80211_scan.h @@ -213,6 +213,7 @@ enum { IEEE80211_BPARSE_OFFCHAN = 0x20, /* DSPARMS chan != curchan */ IEEE80211_BPARSE_BINTVAL_INVALID= 0x40, /* invalid beacon interval */ IEEE80211_BPARSE_CSA_INVALID = 0x80, /* invalid CSA ie */ + IEEE80211_BPARSE_MESHID_INVALID = 0x100, /* invalid Mesh ID ie */ }; /* @@ -223,7 +224,7 @@ enum { * All multi-byte values must be in host byte order. */ struct ieee80211_scanparams { - uint8_t status; /* bitmask of IEEE80211_BPARSE_* */ + uint32_t status; /* bitmask of IEEE80211_BPARSE_* */ uint8_t chan; /* channel # from FH/DSPARMS */ uint8_t bchan; /* curchan's channel # */ uint8_t fhindex;