Skip to content

Commit

Permalink
cfg80211: fix wext-compat memory leak
Browse files Browse the repository at this point in the history
cfg80211_wext_giwrate and sinfo.pertid might allocate sinfo.pertid via
rdev_get_station(), but never release it. Fix that.

Fixes: 8689c05 ("cfg80211: dynamically allocate per-tid stats for station info")
Signed-off-by: Stefan Seyfried <[email protected]>
[johannes: fix error path, use cfg80211_sinfo_release_content(), add Fixes]
Signed-off-by: Johannes Berg <[email protected]>
  • Loading branch information
Stefan Seyfried authored and jmberg-intel committed Oct 1, 2018
1 parent 43955a4 commit 848e616
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions net/wireless/wext-compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -1278,12 +1278,16 @@ static int cfg80211_wext_giwrate(struct net_device *dev,
if (err)
return err;

if (!(sinfo.filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)))
return -EOPNOTSUPP;
if (!(sinfo.filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE))) {
err = -EOPNOTSUPP;
goto free;
}

rate->value = 100000 * cfg80211_calculate_bitrate(&sinfo.txrate);

return 0;
free:
cfg80211_sinfo_release_content(&sinfo);
return err;
}

/* Get wireless statistics. Called by /proc/net/wireless and by SIOCGIWSTATS */
Expand All @@ -1293,7 +1297,7 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
/* we are under RTNL - globally locked - so can use static structs */
static struct iw_statistics wstats;
static struct station_info sinfo;
static struct station_info sinfo = {};
u8 bssid[ETH_ALEN];

if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION)
Expand Down Expand Up @@ -1352,6 +1356,8 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_TX_FAILED))
wstats.discard.retries = sinfo.tx_failed;

cfg80211_sinfo_release_content(&sinfo);

return &wstats;
}

Expand Down

0 comments on commit 848e616

Please sign in to comment.