| Date | Wed, 11 Sep 2013 00:29:26 -0400 | From | Steven Rostedt <> | Subject | [139/251] mac80211: fix ethtool stats for non-station interfaces |
| |
3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <johannes@sipsolutions.net>
[ Upstream commit e13bae4f807401729b3f27c7e882a96b8b292809 ]
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.
Cc: stable@vger.kernel.org Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- net/mac80211/cfg.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index bb8d96b..cf9523e 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -554,6 +554,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.7.10.4
|