summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTom Hughes <tom@compton.nu>2015-06-29 19:41:49 +0100
committerSasha Levin <sasha.levin@oracle.com>2015-08-27 13:25:43 -0400
commit2dcae0edb07eff075666c233d4e2ac3294d9e99e (patch)
tree2303ad9b80add974c9234f5ff17ca8bd194a278e /net
parent845a83bb5a03839b77c5b1ccc32ded17f3d4b841 (diff)
mac80211: clear subdir_stations when removing debugfs
[ Upstream commit 4479004e6409087d1b4986881dc98c6c15dffb28 ] If we don't do this, and we then fail to recreate the debugfs directory during a mode change, then we will fail later trying to add stations to this now bogus directory: BUG: unable to handle kernel NULL pointer dereference at 0000006c IP: [<c0a92202>] mutex_lock+0x12/0x30 Call Trace: [<c0678ab4>] start_creating+0x44/0xc0 [<c0679203>] debugfs_create_dir+0x13/0xf0 [<f8a938ae>] ieee80211_sta_debugfs_add+0x6e/0x490 [mac80211] Cc: stable@kernel.org Signed-off-by: Tom Hughes <tom@compton.nu> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/debugfs_netdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index c68896adfa96..2d19963e6d97 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -725,6 +725,7 @@ void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata)
debugfs_remove_recursive(sdata->vif.debugfs_dir);
sdata->vif.debugfs_dir = NULL;
+ sdata->debugfs.subdir_stations = NULL;
}
void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)