aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-08-10 19:00:33 -0600
committerDmitry Shmidt <dimitrysh@google.com>2012-02-29 10:35:49 -0800
commit254c20edd7eeda7b0acc379cc30c0ecccce39a66 (patch)
tree99973ebe444b0d0e57e7e2e0bc471fc641bc0211 /include/net
parentd93cdf396dfed7a7fc6d7c31b59538bf52378251 (diff)
downloadkernel_samsung_aries-254c20edd7eeda7b0acc379cc30c0ecccce39a66.zip
kernel_samsung_aries-254c20edd7eeda7b0acc379cc30c0ecccce39a66.tar.gz
kernel_samsung_aries-254c20edd7eeda7b0acc379cc30c0ecccce39a66.tar.bz2
cfg80211: fix a crash in nl80211_send_station
mac80211 leaves sinfo->assoc_req_ies uninitialized, causing a random pointer memory access in nl80211_send_station. Instead of checking if the pointer is null, use sinfo->filled, like the rest of the fields. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cfg80211.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index e95d3ac..d048ed5 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -426,6 +426,7 @@ struct station_parameters {
* @STATION_INFO_RX_BITRATE: @rxrate fields are filled
* @STATION_INFO_BSS_PARAM: @bss_param filled
* @STATION_INFO_CONNECTED_TIME: @connected_time filled
+ * @STATION_INFO_ASSOC_REQ_IES: @assoc_req_ies filled
*/
enum station_info_flags {
STATION_INFO_INACTIVE_TIME = 1<<0,
@@ -444,7 +445,8 @@ enum station_info_flags {
STATION_INFO_SIGNAL_AVG = 1<<13,
STATION_INFO_RX_BITRATE = 1<<14,
STATION_INFO_BSS_PARAM = 1<<15,
- STATION_INFO_CONNECTED_TIME = 1<<16
+ STATION_INFO_CONNECTED_TIME = 1<<16,
+ STATION_INFO_ASSOC_REQ_IES = 1<<17
};
/**