aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTom Hughes <tom@compton.nu>2015-06-29 19:41:49 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:22 +0200
commit77f807e34765258d91104c61f2a3bf64d4c3477b (patch)
tree60498f47a71af1efe8477b89efe5383c6d84990c /net
parent6cb5225f5fb2fcb2978e9650812975619b24e477 (diff)
downloadkernel_samsung_smdk4412-77f807e34765258d91104c61f2a3bf64d4c3477b.zip
kernel_samsung_smdk4412-77f807e34765258d91104c61f2a3bf64d4c3477b.tar.gz
kernel_samsung_smdk4412-77f807e34765258d91104c61f2a3bf64d4c3477b.tar.bz2
mac80211: clear subdir_stations when removing debugfs
commit 4479004e6409087d1b4986881dc98c6c15dffb28 upstream. 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] Signed-off-by: Tom Hughes <tom@compton.nu> Signed-off-by: Johannes Berg <johannes.berg@intel.com> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 880a55d..0228ecb 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -598,6 +598,7 @@ void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata)
debugfs_remove_recursive(sdata->debugfs.dir);
sdata->debugfs.dir = NULL;
+ sdata->debugfs.subdir_stations = NULL;
}
void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)