diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-27 14:31:53 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-08 09:16:57 +0200 |
| commit | 1946bed95707ef75d85e94ebe106ce7a119ca831 (patch) | |
| tree | a0be226b4fed65ac75344222e70c2cdddb5b0888 /net/mac80211 | |
| parent | 1cd8e88e17729f57a9c7f751103e522596bb5de2 (diff) | |
| download | linux-3.10-1946bed95707ef75d85e94ebe106ce7a119ca831.tar.gz linux-3.10-1946bed95707ef75d85e94ebe106ce7a119ca831.tar.bz2 linux-3.10-1946bed95707ef75d85e94ebe106ce7a119ca831.zip | |
mac80211: check ERP info IE length in parser
It's always just one byte, so check for that and
remove the length field from the parser struct.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 1 | ||||
| -rw-r--r-- | net/mac80211/mlme.c | 2 | ||||
| -rw-r--r-- | net/mac80211/scan.c | 5 | ||||
| -rw-r--r-- | net/mac80211/util.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index eccd1d805ec..6ad019d3262 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1189,7 +1189,6 @@ struct ieee802_11_elems { u8 tim_len; u8 challenge_len; u8 rsn_len; - u8 erp_info_len; u8 ext_supp_rates_len; u8 wmm_info_len; u8 wmm_param_len; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index f76c58fb3bd..157d951df7a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3038,7 +3038,7 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, changed |= BSS_CHANGED_DTIM_PERIOD; } - if (elems.erp_info && elems.erp_info_len >= 1) { + if (elems.erp_info) { erp_valid = true; erp_value = elems.erp_info[0]; } else { diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 581764f92e1..33fbf104569 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -98,9 +98,8 @@ ieee80211_bss_info_update(struct ieee80211_local *local, } /* save the ERP value so that it is available at association time */ - if (elems->erp_info && elems->erp_info_len >= 1 && - (!elems->parse_error || - !(bss->valid_data & IEEE80211_BSS_VALID_ERP))) { + if (elems->erp_info && (!elems->parse_error || + !(bss->valid_data & IEEE80211_BSS_VALID_ERP))) { bss->erp_value = elems->erp_info[0]; bss->has_erp_value = true; if (!elems->parse_error) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 0f7d1c20f8a..4839dec5c9a 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -780,8 +780,10 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len, elems->rsn_len = elen; break; case WLAN_EID_ERP_INFO: - elems->erp_info = pos; - elems->erp_info_len = elen; + if (elen >= 1) + elems->erp_info = pos; + else + elem_parse_failed = true; break; case WLAN_EID_EXT_SUPP_RATES: elems->ext_supp_rates = pos; |