korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: allocate and fill tidstats only when needed

Browse Source 
This fixes memory leaks in the case where we just have the
station info on the stack for internal usage without sending
it to cfg80211.

Fixes: 8689c051a2 ("cfg80211: dynamically allocate per-tid stats for station info")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2018-05-18 11:40:44 +02:00
parent 39c1134c66
commit 0fdf1493b4
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/cfg.c
View File

@ -695,7 +695,7 @@ static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
if (sta) { if (sta) {
ret = 0; ret = 0;
memcpy(mac, sta->sta.addr, ETH_ALEN); memcpy(mac, sta->sta.addr, ETH_ALEN);
sta_set_sinfo(sta, sinfo); sta_set_sinfo(sta, sinfo, true);
} }
mutex_unlock(&local->sta_mtx); mutex_unlock(&local->sta_mtx);
@ -724,7 +724,7 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
sta = sta_info_get_bss(sdata, mac); sta = sta_info_get_bss(sdata, mac);
if (sta) { if (sta) {
ret = 0; ret = 0;
sta_set_sinfo(sta, sinfo); sta_set_sinfo(sta, sinfo, true);
} }
mutex_unlock(&local->sta_mtx); mutex_unlock(&local->sta_mtx);

4
net/mac80211/ethtool.c
View File

@ -108,7 +108,7 @@ static void ieee80211_get_stats(struct net_device *dev,
goto do_survey; goto do_survey;
memset(&sinfo, 0, sizeof(sinfo)); memset(&sinfo, 0, sizeof(sinfo));
sta_set_sinfo(sta, &sinfo); sta_set_sinfo(sta, &sinfo, false);
i = 0; i = 0;
ADD_STA_STATS(sta); ADD_STA_STATS(sta);
@ -135,7 +135,7 @@ static void ieee80211_get_stats(struct net_device *dev,
continue; continue;
memset(&sinfo, 0, sizeof(sinfo)); memset(&sinfo, 0, sizeof(sinfo));
sta_set_sinfo(sta, &sinfo); sta_set_sinfo(sta, &sinfo, false);
i = 0; i = 0;
ADD_STA_STATS(sta); ADD_STA_STATS(sta);
} }

7
net/mac80211/sta_info.c
View File

@ -1008,7 +1008,7 @@ static void __sta_info_destroy_part2(struct sta_info *sta)
sinfo = kzalloc(sizeof(*sinfo), GFP_KERNEL); sinfo = kzalloc(sizeof(*sinfo), GFP_KERNEL);
if (sinfo) if (sinfo)
sta_set_sinfo(sta, sinfo); sta_set_sinfo(sta, sinfo, true);
cfg80211_del_sta_sinfo(sdata->dev, sta->sta.addr, sinfo, GFP_KERNEL); cfg80211_del_sta_sinfo(sdata->dev, sta->sta.addr, sinfo, GFP_KERNEL);
kfree(sinfo); kfree(sinfo);
@ -2079,7 +2079,8 @@ static inline u64 sta_get_stats_bytes(struct ieee80211_sta_rx_stats *rxstats)
return value; return value;
} }
void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
bool tidstats)
{ {
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
@ -2233,7 +2234,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE); sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE);
} }
if (!cfg80211_sinfo_alloc_tid_stats(sinfo, GFP_KERNEL)) { if (tidstats && !cfg80211_sinfo_alloc_tid_stats(sinfo, GFP_KERNEL)) {
for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) { for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {
struct cfg80211_tid_stats *tidstats = &sinfo->pertid[i]; struct cfg80211_tid_stats *tidstats = &sinfo->pertid[i];

3
net/mac80211/sta_info.h
View File

@ -744,7 +744,8 @@ static inline int sta_info_flush(struct ieee80211_sub_if_data *sdata)
void sta_set_rate_info_tx(struct sta_info *sta, void sta_set_rate_info_tx(struct sta_info *sta,
const struct ieee80211_tx_rate *rate, const struct ieee80211_tx_rate *rate,
struct rate_info *rinfo); struct rate_info *rinfo);
void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo); void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
bool tidstats);
u32 sta_get_expected_throughput(struct sta_info *sta); u32 sta_get_expected_throughput(struct sta_info *sta);