aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-04-18 11:33:24 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-04-22 16:57:18 -0400
commite7ec86f54e519e8e86f1cf328db13263f3ef8bd4 (patch)
tree2b0a66930abf4ac710cc15120195c9259a0fcaba /net/mac80211/ieee80211_i.h
parentba44cb7226afd4e19308c1d8a90e8b7c566c0d8b (diff)
mac80211: validate TIM IE length (redux)
The TIM IE must not be shorter than 4 bytes, so verify that when parsing it and use the proper type. To ease that adjust struct ieee80211_tim_ie to have a virtual bitmap of size at least 1. Also check that the TIM IE is actually present before trying to parse it! Because other people may need the function, make it a static inline in ieee80211.h. (The original "mac80211: validate TIM IE length" was a minimal fix for 2.6.30. This purports to be the full, correct fix. -- JWL) Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index dba78d89a10c..1579bc92c88d 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -832,7 +832,7 @@ struct ieee802_11_elems {
832 u8 *fh_params; 832 u8 *fh_params;
833 u8 *ds_params; 833 u8 *ds_params;
834 u8 *cf_params; 834 u8 *cf_params;
835 u8 *tim; 835 struct ieee80211_tim_ie *tim;
836 u8 *ibss_params; 836 u8 *ibss_params;
837 u8 *challenge; 837 u8 *challenge;
838 u8 *wpa; 838 u8 *wpa;