1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index f32561ec224c..cee4884b9d06 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -529,12 +529,12 @@ void ieee802_11_parse_elems(u8 *start, size_t len,
                        elems->ext_supp_rates_len = elen;
                        break;
                case WLAN_EID_HT_CAPABILITY:
-                        elems->ht_cap_elem = pos;
+                        if (elen >= sizeof(struct ieee80211_ht_cap))
-                        elems->ht_cap_elem_len = elen;
+                                elems->ht_cap_elem = (void *)pos;
                        break;
                case WLAN_EID_HT_EXTRA_INFO:
-                        elems->ht_info_elem = pos;
+                        if (elen >= sizeof(struct ieee80211_ht_addt_info))
-                        elems->ht_info_elem_len = elen;
+                                elems->ht_info_elem = (void *)pos;
                        break;
                case WLAN_EID_MESH_ID:
                        elems->mesh_id = pos;

diff --git a/net/mac80211/util.c b/net/mac80211/util.c index f32561ec224c..cee4884b9d06 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c
@@ -529,12 +529,12 @@ void ieee802_11_parse_elems(u8 *start, size_t len,
529	elems->ext_supp_rates_len = elen;	529	elems->ext_supp_rates_len = elen;
530	break;	530	break;
531	case WLAN_EID_HT_CAPABILITY:	531	case WLAN_EID_HT_CAPABILITY:
532	elems->ht_cap_elem = pos;	532	if (elen >= sizeof(struct ieee80211_ht_cap))
533	elems->ht_cap_elem_len = elen;	533	elems->ht_cap_elem = (void *)pos;
534	break;	534	break;
535	case WLAN_EID_HT_EXTRA_INFO:	535	case WLAN_EID_HT_EXTRA_INFO:
536	elems->ht_info_elem = pos;	536	if (elen >= sizeof(struct ieee80211_ht_addt_info))
537	elems->ht_info_elem_len = elen;	537	elems->ht_info_elem = (void *)pos;
538	break;	538	break;
539	case WLAN_EID_MESH_ID:	539	case WLAN_EID_MESH_ID:
540	elems->mesh_id = pos;	540	elems->mesh_id = pos;