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/scan.c | |
| parent | mac80211: check DSSS params IE length in parser (diff) | |
| download | linux-1946bed95707ef75d85e94ebe106ce7a119ca831.tar.xz linux-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/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 581764f92e13..33fbf1045690 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) |