| Message ID | 20190724194634.205718-1-briannorris@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | df612421fe2566654047769c6852ffae1a31df16 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [5.3] mwifiex: fix 802.11n/WPA detection | expand |
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: <stable@vger.kernel.org> > Signed-off-by: Brian Norris <briannorris@chromium.org> This isn't seen in linux-next yet. Still pending review? In anyway, Reviewed-by: Takashi Iwai <tiwai@suse.de> 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 = &mwifiex_wpa_oui[cipher][0]; > ret = mwifiex_search_oui_in_ie(iebody, oui); > if (ret) > -- > 2.22.0.657.g960e92d24f-goog >
On Mon, Jul 29, 2019 at 9:01 AM Takashi Iwai <tiwai@suse.de> 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 <tiwai@suse.de> Thanks. Hopefully Kalle can pick it up. Brian
Brian Norris <briannorris@chromium.org> writes: > On Mon, Jul 29, 2019 at 9:01 AM Takashi Iwai <tiwai@suse.de> 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 <tiwai@suse.de> > > Thanks. Hopefully Kalle can pick it up. I expect to apply this today.
Brian Norris <briannorris@chromium.org> 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: <stable@vger.kernel.org> > Signed-off-by: Brian Norris <briannorris@chromium.org> Patch applied to wireless-drivers.git, thanks. df612421fe25 mwifiex: fix 802.11n/WPA detection
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 = &mwifiex_wpa_oui[cipher][0]; ret = mwifiex_search_oui_in_ie(iebody, oui); if (ret)
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: <stable@vger.kernel.org> Signed-off-by: Brian Norris <briannorris@chromium.org> --- drivers/net/wireless/marvell/mwifiex/main.h | 1 + drivers/net/wireless/marvell/mwifiex/scan.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)