summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2019-04-15 11:39:33 +0200
committerJohannes Berg <johannes.berg@intel.com>2019-04-23 13:47:05 +0200
commit517879147493a5e1df6b89a50f708f1133fcaddb (patch)
treecfab240254cb1dc2b7954abc73e48ce290e07718 /net
parent8772eed9a95abd82cf188c93edb9645543ca4418 (diff)
downloadlinux-stable-517879147493a5e1df6b89a50f708f1133fcaddb.tar.gz
linux-stable-517879147493a5e1df6b89a50f708f1133fcaddb.tar.bz2
linux-stable-517879147493a5e1df6b89a50f708f1133fcaddb.zip
mac80211: don't attempt to rename ERR_PTR() debugfs dirs
We need to dereference the directory to get its parent to be able to rename it, so it's clearly not safe to try to do this with ERR_PTR() pointers. Skip in this case. It seems that this is most likely what was causing the report by syzbot, but I'm not entirely sure as it didn't come with a reproducer this time. Cc: stable@vger.kernel.org Reported-by: syzbot+4ece1a28b8f4730547c9@syzkaller.appspotmail.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/debugfs_netdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index cff0fb3578c9..deb3faf08337 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -841,7 +841,7 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)
dir = sdata->vif.debugfs_dir;
- if (!dir)
+ if (IS_ERR_OR_NULL(dir))
return;
sprintf(buf, "netdev:%s", sdata->name);