summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSara Sharon <sara.sharon@intel.com>2018-02-19 14:48:35 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-30 07:51:58 +0200
commit99d4fe95e4f6289176a403722e5c8dd5815a64a8 (patch)
tree4060f3c0e60a93ef5c4bfb6ae8816c1f79580cb7
parentf49e3a9acc524b8641bcacf8e33a1cac27371213 (diff)
downloadlinux-stable-99d4fe95e4f6289176a403722e5c8dd5815a64a8.tar.gz
linux-stable-99d4fe95e4f6289176a403722e5c8dd5815a64a8.tar.bz2
linux-stable-99d4fe95e4f6289176a403722e5c8dd5815a64a8.zip
mac80211: fix a possible leak of station stats
[ Upstream commit d78d9ee9d40aca4781d2c5334972544601a4c3a2 ] If sta_info_alloc fails after allocating the per CPU statistics, they are not properly freed. Fixes: c9c5962b56c1 ("mac80211: enable collecting station statistics per-CPU") Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 69615016d5bf..33e0f451ff9f 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -439,6 +439,7 @@ free_txq:
if (sta->sta.txq[0])
kfree(to_txq_info(sta->sta.txq[0]));
free:
+ free_percpu(sta->pcpu_rx_stats);
#ifdef CONFIG_MAC80211_MESH
kfree(sta->mesh);
#endif