Re: [PATCH 5.3] mwifiex: fix 802.11n/WPA detection
Brian Norris wrote:
> Commit 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant
> vendor IEs") adjusted the ieee_types_vendor_header struct, which
> inadvertently messed up the offsets used in
> mwifiex_is_wpa_oui_present(). Add that offset back in, mirroring
> mwifiex_is_rsn_oui_present().
>
> As it stands, commit 63d7ef36103d breaks compatibility with WPA (not
> WPA2) 802.11n networks, since we hit the "info: Disable 11n if AES is
> not supported by AP" case in mwifiex_is_network_compatible().
>
> Fixes: 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant vendor
> IEs")
> Cc:
> Signed-off-by: Brian Norris
Patch applied to wireless-drivers.git, thanks.
df612421fe25 mwifiex: fix 802.11n/WPA detection
--
https://patchwork.kernel.org/patch/11057585/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 5.3] mwifiex: fix 802.11n/WPA detection
Brian Norris writes: > On Mon, Jul 29, 2019 at 9:01 AM Takashi Iwai wrote: >> This isn't seen in linux-next yet. > > Apparently not. > >> Still pending review? > > I guess? Probably mostly pending maintainer attention. Correct, I was offline for few days. > Also, Johannes already had noticed (and privately messaged me): this > patch took a while to show up on the linux-wireless Patchwork > instance. So the first review (from Guenter Roeck) and my extra reply > noting the -stable regression didn't make it to Patchwork: > > https://patchwork.kernel.org/patch/11057585/ > >> In anyway, >> Reviewed-by: Takashi Iwai > > Thanks. Hopefully Kalle can pick it up. I expect to apply this today. -- Kalle Valo
Re: [PATCH 5.3] mwifiex: fix 802.11n/WPA detection
On Mon, Jul 29, 2019 at 9:01 AM Takashi Iwai wrote: > This isn't seen in linux-next yet. Apparently not. > Still pending review? I guess? Probably mostly pending maintainer attention. Also, Johannes already had noticed (and privately messaged me): this patch took a while to show up on the linux-wireless Patchwork instance. So the first review (from Guenter Roeck) and my extra reply noting the -stable regression didn't make it to Patchwork: https://patchwork.kernel.org/patch/11057585/ > In anyway, > Reviewed-by: Takashi Iwai Thanks. Hopefully Kalle can pick it up. Brian
Re: [PATCH 5.3] mwifiex: fix 802.11n/WPA detection
On Wed, 24 Jul 2019 21:46:34 +0200,
Brian Norris wrote:
>
> Commit 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant
> vendor IEs") adjusted the ieee_types_vendor_header struct, which
> inadvertently messed up the offsets used in
> mwifiex_is_wpa_oui_present(). Add that offset back in, mirroring
> mwifiex_is_rsn_oui_present().
>
> As it stands, commit 63d7ef36103d breaks compatibility with WPA (not
> WPA2) 802.11n networks, since we hit the "info: Disable 11n if AES is
> not supported by AP" case in mwifiex_is_network_compatible().
>
> Fixes: 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant vendor
> IEs")
> Cc:
> Signed-off-by: Brian Norris
This isn't seen in linux-next yet. Still pending review?
In anyway,
Reviewed-by: Takashi Iwai
Thanks!
Takashi
> ---
> drivers/net/wireless/marvell/mwifiex/main.h | 1 +
> drivers/net/wireless/marvell/mwifiex/scan.c | 3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/main.h
> b/drivers/net/wireless/marvell/mwifiex/main.h
> index 3e442c7f7882..095837fba300 100644
> --- a/drivers/net/wireless/marvell/mwifiex/main.h
> +++ b/drivers/net/wireless/marvell/mwifiex/main.h
> @@ -124,6 +124,7 @@ enum {
>
> #define MWIFIEX_MAX_TOTAL_SCAN_TIME (MWIFIEX_TIMER_10S - MWIFIEX_TIMER_1S)
>
> +#define WPA_GTK_OUI_OFFSET 2
> #define RSN_GTK_OUI_OFFSET 2
>
> #define MWIFIEX_OUI_NOT_PRESENT 0
> diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c
> b/drivers/net/wireless/marvell/mwifiex/scan.c
> index 0d6d41727037..21dda385f6c6 100644
> --- a/drivers/net/wireless/marvell/mwifiex/scan.c
> +++ b/drivers/net/wireless/marvell/mwifiex/scan.c
> @@ -181,7 +181,8 @@ mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor
> *bss_desc, u32 cipher)
> u8 ret = MWIFIEX_OUI_NOT_PRESENT;
>
> if (has_vendor_hdr(bss_desc->bcn_wpa_ie, WLAN_EID_VENDOR_SPECIFIC)) {
> - iebody = (struct ie_body *) bss_desc->bcn_wpa_ie->data;
> + iebody = (struct ie_body *)((u8 *)bss_desc->bcn_wpa_ie->data +
> + WPA_GTK_OUI_OFFSET);
> oui = _wpa_oui[cipher][0];
> ret = mwifiex_search_oui_in_ie(iebody, oui);
> if (ret)
> --
> 2.22.0.657.g960e92d24f-goog
>
[PATCH 5.3] mwifiex: fix 802.11n/WPA detection
Commit 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant
vendor IEs") adjusted the ieee_types_vendor_header struct, which
inadvertently messed up the offsets used in
mwifiex_is_wpa_oui_present(). Add that offset back in, mirroring
mwifiex_is_rsn_oui_present().
As it stands, commit 63d7ef36103d breaks compatibility with WPA (not
WPA2) 802.11n networks, since we hit the "info: Disable 11n if AES is
not supported by AP" case in mwifiex_is_network_compatible().
Fixes: 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant vendor IEs")
Cc:
Signed-off-by: Brian Norris
---
drivers/net/wireless/marvell/mwifiex/main.h | 1 +
drivers/net/wireless/marvell/mwifiex/scan.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h
b/drivers/net/wireless/marvell/mwifiex/main.h
index 3e442c7f7882..095837fba300 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -124,6 +124,7 @@ enum {
#define MWIFIEX_MAX_TOTAL_SCAN_TIME(MWIFIEX_TIMER_10S - MWIFIEX_TIMER_1S)
+#define WPA_GTK_OUI_OFFSET 2
#define RSN_GTK_OUI_OFFSET 2
#define MWIFIEX_OUI_NOT_PRESENT0
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c
b/drivers/net/wireless/marvell/mwifiex/scan.c
index 0d6d41727037..21dda385f6c6 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -181,7 +181,8 @@ mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor
*bss_desc, u32 cipher)
u8 ret = MWIFIEX_OUI_NOT_PRESENT;
if (has_vendor_hdr(bss_desc->bcn_wpa_ie, WLAN_EID_VENDOR_SPECIFIC)) {
- iebody = (struct ie_body *) bss_desc->bcn_wpa_ie->data;
+ iebody = (struct ie_body *)((u8 *)bss_desc->bcn_wpa_ie->data +
+ WPA_GTK_OUI_OFFSET);
oui = _wpa_oui[cipher][0];
ret = mwifiex_search_oui_in_ie(iebody, oui);
if (ret)
--
2.22.0.657.g960e92d24f-goog
Re: [PATCH 5.3] mwifiex: fix 802.11n/WPA detection
On 7/24/19 12:46 PM, Brian Norris wrote:
Commit 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant
vendor IEs") adjusted the ieee_types_vendor_header struct, which
inadvertently messed up the offsets used in
mwifiex_is_wpa_oui_present(). Add that offset back in, mirroring
mwifiex_is_rsn_oui_present().
As it stands, commit 63d7ef36103d breaks compatibility with WPA (not
WPA2) 802.11n networks, since we hit the "info: Disable 11n if AES is
not supported by AP" case in mwifiex_is_network_compatible().
Fixes: 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant vendor IEs")
Cc:
Signed-off-by: Brian Norris
Reviewed-by: Guenter Roeck
---
drivers/net/wireless/marvell/mwifiex/main.h | 1 +
drivers/net/wireless/marvell/mwifiex/scan.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h
b/drivers/net/wireless/marvell/mwifiex/main.h
index 3e442c7f7882..095837fba300 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -124,6 +124,7 @@ enum {
#define MWIFIEX_MAX_TOTAL_SCAN_TIME (MWIFIEX_TIMER_10S - MWIFIEX_TIMER_1S)
+#define WPA_GTK_OUI_OFFSET2
#define RSN_GTK_OUI_OFFSET2
#define MWIFIEX_OUI_NOT_PRESENT 0
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c
b/drivers/net/wireless/marvell/mwifiex/scan.c
index 0d6d41727037..21dda385f6c6 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -181,7 +181,8 @@ mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor
*bss_desc, u32 cipher)
u8 ret = MWIFIEX_OUI_NOT_PRESENT;
if (has_vendor_hdr(bss_desc->bcn_wpa_ie, WLAN_EID_VENDOR_SPECIFIC)) {
- iebody = (struct ie_body *) bss_desc->bcn_wpa_ie->data;
+ iebody = (struct ie_body *)((u8 *)bss_desc->bcn_wpa_ie->data +
+ WPA_GTK_OUI_OFFSET);
oui = _wpa_oui[cipher][0];
ret = mwifiex_search_oui_in_ie(iebody, oui);
if (ret)
Re: [PATCH 5.3] mwifiex: fix 802.11n/WPA detection
On Wed, Jul 24, 2019 at 12:46:34PM -0700, Brian Norris wrote:
> Fixes: 63d7ef36103d ("mwifiex: Don't abort on small, spec-compliant vendor
> IEs")
> Cc:
> Signed-off-by: Brian Norris
To add to this: unfortunately, the above went out to -stable earlier
this week. So a prompt merging would be appreciated, pending review of
course.
Sorry for the breakage.
/me goes to add another (embarrasingly missing) test case to our WiFi
test suite.
Brian
