From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3C84C7618B for ; Mon, 29 Jul 2019 16:01:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3ADC21773 for ; Mon, 29 Jul 2019 16:01:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388350AbfG2QBv (ORCPT ); Mon, 29 Jul 2019 12:01:51 -0400 Received: from mx2.suse.de ([195.135.220.15]:43852 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726714AbfG2QBr (ORCPT ); Mon, 29 Jul 2019 12:01:47 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 232D9B020; Mon, 29 Jul 2019 16:01:46 +0000 (UTC) Date: Mon, 29 Jul 2019 18:01:45 +0200 Message-ID: From: Takashi Iwai To: Kalle Valo Cc: Brian Norris , Ganapathi Bhat , Nishant Sarmukadam , Amitkumar Karwar , Xinming Hu , , linux-wireless@vger.kernel.org, Guenter Roeck , stable@vger.kernel.org Subject: Re: [PATCH 5.3] mwifiex: fix 802.11n/WPA detection In-Reply-To: <20190724194634.205718-1-briannorris@chromium.org> References: <20190724194634.205718-1-briannorris@chromium.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 = &mwifiex_wpa_oui[cipher][0]; > ret = mwifiex_search_oui_in_ie(iebody, oui); > if (ret) > -- > 2.22.0.657.g960e92d24f-goog >