summaryrefslogtreecommitdiffstats
path: root/net
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:50:28 +0200
commitae58b7545f76710ab9a776c7cafbae5ebfc0ceb3 (patch)
treef87e7874d69ac46f04736c2b2b1444f80c64cd79 /net
parent5f3c6add07622e31a1f2acf259d8482cb1765792 (diff)
downloadlinux-stable-ae58b7545f76710ab9a776c7cafbae5ebfc0ceb3.tar.gz
linux-stable-ae58b7545f76710ab9a776c7cafbae5ebfc0ceb3.tar.bz2
linux-stable-ae58b7545f76710ab9a776c7cafbae5ebfc0ceb3.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>
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 1ecf3d07d1f5..96bd70319539 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -433,6 +433,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