[ 3.8.y.z extended stable ] Patch "mac80211: fix ethtool stats for non-station interfaces" has been added to staging queue
Kamal Mostafa
kamal at canonical.com
Thu Aug 15 01:05:19 UTC 2013
This is a note to let you know that I have just added a patch titled
mac80211: fix ethtool stats for non-station interfaces
to the linux-3.8.y-queue branch of the 3.8.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.8.y-queue
This patch is scheduled to be released in version 3.8.13.7.
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.8.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Kamal
------
>From 31abcdf646cf19b892604891b9e24f4412f212e7 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes at sipsolutions.net>
Date: Mon, 8 Jul 2013 10:43:31 +0200
Subject: mac80211: fix ethtool stats for non-station interfaces
commit e13bae4f807401729b3f27c7e882a96b8b292809 upstream.
As reported in https://bugzilla.kernel.org/show_bug.cgi?id=60514,
the station loop never initialises 'sinfo' and therefore adds up
a stack values, leaking stack information (the number of times it
adds values is easily obtained another way.)
Fix this by initialising the sinfo for each station to add.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
net/mac80211/cfg.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 49c48c6..40732e3 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -638,6 +638,8 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
if (sta->sdata->dev != dev)
continue;
+ sinfo.filled = 0;
+ sta_set_sinfo(sta, &sinfo);
i = 0;
ADD_STA_STATS(sta);
}
--
1.8.1.2
More information about the kernel-team
mailing list