summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-05-27 22:33:57 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-09 11:14:01 -0700
commita882e11977492f18b77072c036b42777b6ba9760 (patch)
tree47bc375fc8e65b5f668a68a7bac2fad3c2b88de2 /net
parentec19d1e30e66095c1d6977c067b70359e824c4bf (diff)
downloadlinux-3.10-a882e11977492f18b77072c036b42777b6ba9760.tar.gz
linux-3.10-a882e11977492f18b77072c036b42777b6ba9760.tar.bz2
linux-3.10-a882e11977492f18b77072c036b42777b6ba9760.zip
mac80211: fix a memory leak on sta rate selection table
commit 53d045258ee2e38b1e882617cb0799a04d05f5fa upstream. If the rate control algorithm uses a selection table, it is leaked when the station is destroyed - fix that. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Reported-by: Christophe Prévotaux <cprevotaux@nltinc.com> Fixes: 0d528d85c519 ("mac80211: improve the rate control API") [add commit log entry, remove pointless NULL check] Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/sta_info.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 0418777c361..557a5760f9f 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -270,6 +270,7 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);
+ kfree(rcu_dereference_raw(sta->sta.rates));
kfree(sta);
}