mwifiex: fix IE parsing issues

IE's are parsed from beacon buffer and stored locally using
mwifiex_update_bss_desc_with_ie() function.
Sometimes the local pointers point to the data inside IE, but
while using them it is assumed that they are pointing to the IE
itself.

These issues are fixed in this patch.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 13 deletions

diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 5c68173c1d24..d75f4ebd4bdc 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1340,23 +1340,17 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
                                               bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_BSS_COEX_2040:
-                        bss_entry->bcn_bss_co_2040 = current_ptr +
-                                sizeof(struct ieee_types_header);
-                        bss_entry->bss_co_2040_offset = (u16) (current_ptr +
-                                        sizeof(struct ieee_types_header) -
-                                                bss_entry->beacon_buf);
+                        bss_entry->bcn_bss_co_2040 = current_ptr;
+                        bss_entry->bss_co_2040_offset =
+                                (u16) (current_ptr - bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_EXT_CAPABILITY:
-                        bss_entry->bcn_ext_cap = current_ptr +
-                                sizeof(struct ieee_types_header);
-                        bss_entry->ext_cap_offset = (u16) (current_ptr +
-                                        sizeof(struct ieee_types_header) -
-                                        bss_entry->beacon_buf);
+                        bss_entry->bcn_ext_cap = current_ptr;
+                        bss_entry->ext_cap_offset =
+                                (u16) (current_ptr - bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_OPMODE_NOTIF:
-                        bss_entry->oper_mode =
-                                (void *)(current_ptr +
-                                         sizeof(struct ieee_types_header));
+                        bss_entry->oper_mode = (void *)current_ptr;
                         bss_entry->oper_mode_offset =
                                         (u16)((u8 *)bss_entry->oper_mode -
                                               bss_entry->beacon_buf);