diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-10 19:00:33 -0600 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-11 14:23:06 -0400 |
| commit | 040bdf713d2bec8235f1af705e2d13da5d9baec8 (patch) | |
| tree | 94bf0221a212b7e88ebaccfe9c4b76f4f210bd0f /net/wireless | |
| parent | 6a6767b046e2d336e2af06cb605106ed44a852b6 (diff) | |
| download | linux-3.10-040bdf713d2bec8235f1af705e2d13da5d9baec8.tar.gz linux-3.10-040bdf713d2bec8235f1af705e2d13da5d9baec8.tar.bz2 linux-3.10-040bdf713d2bec8235f1af705e2d13da5d9baec8.zip | |
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 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index ca769770107..253e56319d7 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2236,7 +2236,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq, } nla_nest_end(msg, sinfoattr); - if (sinfo->assoc_req_ies) + if (sinfo->filled & STATION_INFO_ASSOC_REQ_IES) NLA_PUT(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len, sinfo->assoc_req_ies); |