| From 517879147493a5e1df6b89a50f708f1133fcaddb Mon Sep 17 00:00:00 2001 |
| From: Johannes Berg <johannes.berg@intel.com> |
| Date: Mon, 15 Apr 2019 11:39:33 +0200 |
| Subject: mac80211: don't attempt to rename ERR_PTR() debugfs dirs |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| commit 517879147493a5e1df6b89a50f708f1133fcaddb upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/mac80211/debugfs_netdev.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/mac80211/debugfs_netdev.c |
| +++ b/net/mac80211/debugfs_netdev.c |
| @@ -841,7 +841,7 @@ void ieee80211_debugfs_rename_netdev(str |
| |
| dir = sdata->vif.debugfs_dir; |
| |
| - if (!dir) |
| + if (IS_ERR_OR_NULL(dir)) |
| return; |
| |
| sprintf(buf, "netdev:%s", sdata->name); |
