From: Luca Coelho <luca@coelho.fi>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 21/23] mac80211: consider more elements in parsing CRC
Date: Fri, 31 Jan 2020 13:12:58 +0200 [thread overview]
Message-ID: <20200131111300.891737-22-luca@coelho.fi> (raw)
In-Reply-To: <20200131111300.891737-1-luca@coelho.fi>
From: Johannes Berg <johannes.berg@intel.com>
We only use the parsing CRC for checking if a beacon changed,
and elements with an ID > 63 cannot be represented in the
filter. Thus, like we did before with WMM and Cisco vendor
elements, just statically add these forgotten items to the
CRC:
- WLAN_EID_VHT_OPERATION
- WLAN_EID_OPMODE_NOTIF
- WLAN_EID_EXT_HE_OPERATION.
I guess that in most cases when VHT/HE operation change, the HT
operation also changed, and so the change was picked up, but we
did notice that pure operating mode notification changes were
ignored.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
net/mac80211/util.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 7ddf0508779f..278d65ee8121 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -912,8 +912,12 @@ static void ieee80211_parse_extension_element(u32 *crc,
break;
case WLAN_EID_EXT_HE_OPERATION:
if (len >= sizeof(*elems->he_operation) &&
- len == ieee80211_he_oper_size(data) - 1)
+ len == ieee80211_he_oper_size(data) - 1) {
+ if (crc)
+ *crc = crc32_be(*crc, (void *)elem,
+ elem->datalen + 2);
elems->he_operation = data;
+ }
break;
case WLAN_EID_EXT_UORA:
if (len == 1)
@@ -1108,16 +1112,22 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
elem_parse_failed = true;
break;
case WLAN_EID_VHT_OPERATION:
- if (elen >= sizeof(struct ieee80211_vht_operation))
+ if (elen >= sizeof(struct ieee80211_vht_operation)) {
elems->vht_operation = (void *)pos;
- else
- elem_parse_failed = true;
+ if (calc_crc)
+ crc = crc32_be(crc, pos - 2, elen + 2);
+ break;
+ }
+ elem_parse_failed = true;
break;
case WLAN_EID_OPMODE_NOTIF:
- if (elen > 0)
+ if (elen > 0) {
elems->opmode_notif = pos;
- else
- elem_parse_failed = true;
+ if (calc_crc)
+ crc = crc32_be(crc, pos - 2, elen + 2);
+ break;
+ }
+ elem_parse_failed = true;
break;
case WLAN_EID_MESH_ID:
elems->mesh_id = pos;
--
2.24.1
next prev parent reply other threads:[~2020-01-31 11:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-31 11:12 [PATCH 00/23] cfg80211/mac80211 patches from our internal tree 2020-01-31 Luca Coelho
2020-01-31 11:12 ` [PATCH 01/23] nl80211/cfg80211: add support for non EDCA based ranging measurement Luca Coelho
2020-01-31 11:12 ` [PATCH 02/23] mac80211: simplify and improve HT/VHT/HE disable code Luca Coelho
2020-01-31 11:12 ` [PATCH 03/23] mac80211: refactor extended element parsing Luca Coelho
2020-01-31 11:12 ` [PATCH 04/23] mac80211: set station bandwidth from HE capability Luca Coelho
2020-01-31 11:12 ` [PATCH 05/23] mac80211: remove some stray braces Luca Coelho
2020-01-31 11:12 ` [PATCH 06/23] cfg80211: add no HE indication to the channel flag Luca Coelho
2020-01-31 11:12 ` [PATCH 07/23] mac80211: check whether HE connection is allowed by the reg domain Luca Coelho
2020-01-31 11:12 ` [PATCH 08/23] mac80211: he: set rx nss Luca Coelho
2020-01-31 11:12 ` [PATCH 09/23] mac80211: allow changing TX-related netdev features Luca Coelho
2020-01-31 11:12 ` [PATCH 10/23] mac80211: make ieee80211_wep_init() return void Luca Coelho
2020-01-31 11:12 ` [PATCH 11/23] mac80211: update conditions for supported channels element Luca Coelho
2020-01-31 11:31 ` [PATCH v2] mac80211: remove supported channels element in 6 GHz if ECSA support Luca Coelho
2020-01-31 11:12 ` [PATCH 12/23] cfg80211: Limit the registration for authentication frames Luca Coelho
2020-01-31 11:45 ` [PATCH 12/23 v2] cfg80211/mac80211: Allow user space to register for station Rx authentication Luca Coelho
2020-01-31 11:12 ` [PATCH 13/23] mac80211: Accept broadcast probe responses on 6GHz band Luca Coelho
2020-01-31 11:12 ` [PATCH 14/23] mac80211: fix quiet mode activation in action frames Luca Coelho
2020-01-31 11:12 ` [PATCH 15/23] mac80211: update condition for HE disablement Luca Coelho
2020-01-31 11:12 ` [PATCH 16/23] mac80211: Handle SMPS mode changes only in AP mode Luca Coelho
2020-01-31 11:12 ` [PATCH 17/23] nl80211: he: pass to driver the HE operation IE Luca Coelho
2020-01-31 11:12 ` [PATCH 18/23] mac80211: he: set missing bss_conf fields in AP mode Luca Coelho
2020-01-31 11:12 ` [PATCH 19/23] mac80211: Remove support for changing AP SMPS mode Luca Coelho
2020-01-31 11:12 ` [PATCH 20/23] mac80211: parse also the RSNXE IE Luca Coelho
2020-01-31 11:12 ` Luca Coelho [this message]
2020-01-31 11:12 ` [PATCH 22/23] nl80211: add PROTECTED_TWT nl80211 extended feature Luca Coelho
2020-01-31 11:13 ` [PATCH 23/23] mac80211: Properly set the SMPS mode for 6GHz station Luca Coelho
2020-02-14 9:06 ` Johannes Berg
2020-03-26 9:29 ` Luca Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200131111300.891737-22-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).