1 files changed, 35 insertions, 7 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 22ca35054dd0..e6e4bda0528e 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -643,13 +643,41 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
                        break;
                }
-                if (id != WLAN_EID_VENDOR_SPECIFIC &&
+                switch (id) {
-                    id != WLAN_EID_QUIET &&
+                case WLAN_EID_SSID:
-                    test_bit(id, seen_elems)) {
+                case WLAN_EID_SUPP_RATES:
-                        elems->parse_error = true;
+                case WLAN_EID_FH_PARAMS:
-                        left -= elen;
+                case WLAN_EID_DS_PARAMS:
-                        pos += elen;
+                case WLAN_EID_CF_PARAMS:
-                        continue;
+                case WLAN_EID_TIM:
+                case WLAN_EID_IBSS_PARAMS:
+                case WLAN_EID_CHALLENGE:
+                case WLAN_EID_RSN:
+                case WLAN_EID_ERP_INFO:
+                case WLAN_EID_EXT_SUPP_RATES:
+                case WLAN_EID_HT_CAPABILITY:
+                case WLAN_EID_HT_OPERATION:
+                case WLAN_EID_VHT_CAPABILITY:
+                case WLAN_EID_VHT_OPERATION:
+                case WLAN_EID_MESH_ID:
+                case WLAN_EID_MESH_CONFIG:
+                case WLAN_EID_PEER_MGMT:
+                case WLAN_EID_PREQ:
+                case WLAN_EID_PREP:
+                case WLAN_EID_PERR:
+                case WLAN_EID_RANN:
+                case WLAN_EID_CHANNEL_SWITCH:
+                case WLAN_EID_EXT_CHANSWITCH_ANN:
+                case WLAN_EID_COUNTRY:
+                case WLAN_EID_PWR_CONSTRAINT:
+                case WLAN_EID_TIMEOUT_INTERVAL:
+                        if (test_bit(id, seen_elems)) {
+                                elems->parse_error = true;
+                                left -= elen;
+                                pos += elen;
+                                continue;
+                        }
+                        break;
                }
                if (calc_crc && id < 64 && (filter & (1ULL << id)))

diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 22ca35054dd0..e6e4bda0528e 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c
@@ -643,13 +643,41 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
643	break;	643	break;
644	}	644	}
645		645
646	if (id != WLAN_EID_VENDOR_SPECIFIC &&	646	switch (id) {
647	id != WLAN_EID_QUIET &&	647	case WLAN_EID_SSID:
648	test_bit(id, seen_elems)) {	648	case WLAN_EID_SUPP_RATES:
649	elems->parse_error = true;	649	case WLAN_EID_FH_PARAMS:
650	left -= elen;	650	case WLAN_EID_DS_PARAMS:
651	pos += elen;	651	case WLAN_EID_CF_PARAMS:
652	continue;	652	case WLAN_EID_TIM:
		653	case WLAN_EID_IBSS_PARAMS:
		654	case WLAN_EID_CHALLENGE:
		655	case WLAN_EID_RSN:
		656	case WLAN_EID_ERP_INFO:
		657	case WLAN_EID_EXT_SUPP_RATES:
		658	case WLAN_EID_HT_CAPABILITY:
		659	case WLAN_EID_HT_OPERATION:
		660	case WLAN_EID_VHT_CAPABILITY:
		661	case WLAN_EID_VHT_OPERATION:
		662	case WLAN_EID_MESH_ID:
		663	case WLAN_EID_MESH_CONFIG:
		664	case WLAN_EID_PEER_MGMT:
		665	case WLAN_EID_PREQ:
		666	case WLAN_EID_PREP:
		667	case WLAN_EID_PERR:
		668	case WLAN_EID_RANN:
		669	case WLAN_EID_CHANNEL_SWITCH:
		670	case WLAN_EID_EXT_CHANSWITCH_ANN:
		671	case WLAN_EID_COUNTRY:
		672	case WLAN_EID_PWR_CONSTRAINT:
		673	case WLAN_EID_TIMEOUT_INTERVAL:
		674	if (test_bit(id, seen_elems)) {
		675	elems->parse_error = true;
		676	left -= elen;
		677	pos += elen;
		678	continue;
		679	}
		680	break;
653	}	681	}
654		682
655	if (calc_crc && id < 64 && (filter & (1ULL << id)))	683	if (calc_crc && id < 64 && (filter & (1ULL << id)))