2014-05-27 20:34:02

by Felix Fietkau

Subject: [PATCH v2] mac80211: fix a memory leak on sta rate selection table

Signed-off-by: Felix Fietkau <[email protected]>
Reported-by: Christophe Prévotaux <[email protected]>
Fixes: 0d528d85c5
Cc: [email protected] # v3.10+
---
net/mac80211/sta_info.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 632d372..3f26740 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -227,6 +227,7 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
*/
void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
{
+ struct ieee80211_sta_rates *rates;
int i;

if (sta->rate_ctrl)
@@ -238,6 +239,10 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
kfree(sta->tx_lat);
}

+ rates = rcu_dereference_raw(sta->sta.rates);
+ if (rates)
+ kfree(rates);
+
sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);

kfree(sta);
--
1.8.5.2 (Apple Git-48)

2014-05-28 13:56:53

by Johannes Berg

Subject: Re: [PATCH v2] mac80211: fix a memory leak on sta rate selection table

On Tue, 2014-05-27 at 22:33 +0200, Felix Fietkau wrote:
> Signed-off-by: Felix Fietkau <[email protected]>
> Reported-by: Christophe Prévotaux <[email protected]>
> Fixes: 0d528d85c5
> Cc: [email protected] # v3.10+

Applied, with fixes to the commit log

johannes