[3.13.y.z extended stable] Patch "mac80211: fix a memory leak on sta rate selection table" has been added to staging queue

Kamal Mostafa kamal at canonical.com
Tue Jul 15 21:29:24 UTC 2014


This is a note to let you know that I have just added a patch titled

    mac80211: fix a memory leak on sta rate selection table

to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11.5.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From bef4cff9f35e1504e21b54049c2cc70e6bc23b77 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd at openwrt.org>
Date: Tue, 27 May 2014 22:33:57 +0200
Subject: mac80211: fix a memory leak on sta rate selection table
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 53d045258ee2e38b1e882617cb0799a04d05f5fa upstream.

If the rate control algorithm uses a selection table, it
is leaked when the station is destroyed - fix that.

Signed-off-by: Felix Fietkau <nbd at openwrt.org>
Reported-by: Christophe Prévotaux <cprevotaux at nltinc.com>
Fixes: 0d528d85c519 ("mac80211: improve the rate control API")
[add commit log entry, remove pointless NULL check]
Signed-off-by: Johannes Berg <johannes.berg at intel.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 net/mac80211/sta_info.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index f92e221..ae0c132 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -271,6 +271,7 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)

 	sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);

+	kfree(rcu_dereference_raw(sta->sta.rates));
 	kfree(sta);
 }

--
1.9.1





More information about the kernel-team mailing list