summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg2014-03-04 11:43:28 +0100
committerJohannes Berg2014-03-19 21:29:52 +0100
commitd2722f8b87fb172ff2f31d3a2816b31d58678d40 (patch)
tree6944ac9cc71ffe7de37fa252b32c954810894418 /net/mac80211/mlme.c
parentcfg80211: allow reprocessing of pending requests (diff)
downloadkernel-qcow2-linux-d2722f8b87fb172ff2f31d3a2816b31d58678d40.tar.gz
kernel-qcow2-linux-d2722f8b87fb172ff2f31d3a2816b31d58678d40.tar.xz
kernel-qcow2-linux-d2722f8b87fb172ff2f31d3a2816b31d58678d40.zip
mac80211: fix potential use-after-free
The bss struct might be freed in ieee80211_rx_bss_put(), so we shouldn't use it afterwards. Cc: stable@vger.kernel.org (3.10+) Fixes: 817cee7675237 ("mac80211: track AP's beacon rate and give it to the driver") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 46b62bb3677c..423816f18b55 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2780,8 +2780,8 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
bss = ieee80211_bss_info_update(local, rx_status, mgmt, len, elems,
channel);
if (bss) {
- ieee80211_rx_bss_put(local, bss);
sdata->vif.bss_conf.beacon_rate = bss->beacon_rate;
+ ieee80211_rx_bss_put(local, bss);
}
}