[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20130115185005.619003798@linuxfoundation.org>
Date: Tue, 15 Jan 2013 10:50:32 -0800
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
alan@...rguk.ukuu.org.uk, Arend Van Spriel <arend@...adcom.com>,
Pieter-Paul Giesberts <pieterpg@...adcom.com>,
Hante Meuleman <meuleman@...adcom.com>,
"John W. Linville" <linville@...driver.com>
Subject: [ 105/221] brcmfmac: fix parsing rsn ie for ap mode.
3.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hante Meuleman <meuleman@...adcom.com>
commit 619c5a9ad54e6bbdafd16d1cdc6c049403710540 upstream.
RSN IEs got incorrectly parsed and therefore ap mode using WPA2
security was not working.
Reviewed-by: Arend Van Spriel <arend@...adcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@...adcom.com>
Signed-off-by: Hante Meuleman <meuleman@...adcom.com>
Signed-off-by: Arend van Spriel <arend@...adcom.com>
Signed-off-by: John W. Linville <linville@...driver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3730,10 +3730,11 @@ brcmf_configure_wpaie(struct net_device
len = wpa_ie->len + TLV_HDR_LEN;
data = (u8 *)wpa_ie;
- offset = 0;
+ offset = TLV_HDR_LEN;
if (!is_rsn_ie)
offset += VS_IE_FIXED_HDR_LEN;
- offset += WPA_IE_VERSION_LEN;
+ else
+ offset += WPA_IE_VERSION_LEN;
/* check for multicast cipher suite */
if (offset + WPA_IE_MIN_OUI_LEN > len) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists