diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-05-25 11:38:17 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-05-25 13:12:32 +0200 |
| commit | 0bbab5f0301587cad4e923ccc49bb910db86162c (patch) | |
| tree | d5c02046361bf28b457d9bb79598f6eacdb3a040 | |
| parent | d031781bdabe1027858a3220f868866586bf6e7c (diff) | |
| download | linux-0bbab5f0301587cad4e923ccc49bb910db86162c.tar.gz linux-0bbab5f0301587cad4e923ccc49bb910db86162c.tar.bz2 linux-0bbab5f0301587cad4e923ccc49bb910db86162c.zip | |
cfg80211: fix debugfs rename crash
Removing the "if (IS_ERR(dir)) dir = NULL;" check only works
if we adjust the remaining code to not rely on it being NULL.
Check IS_ERR_OR_NULL() before attempting to dereference it.
I'm not actually entirely sure this fixes the syzbot crash as
the kernel config indicates that they do have DEBUG_FS in the
kernel, but this is what I found when looking there.
Cc: stable@vger.kernel.org
Fixes: d82574a8e5a4 ("cfg80211: no need to check return value of debugfs_create functions")
Reported-by: syzbot+fd5332e429401bf42d18@syzkaller.appspotmail.com
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20200525113816.fc4da3ec3d4b.Ica63a110679819eaa9fb3bc1b7437d96b1fd187d@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/wireless/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 341402b4f178..ce024440fa51 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -142,7 +142,7 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, if (result) return result; - if (rdev->wiphy.debugfsdir) + if (!IS_ERR_OR_NULL(rdev->wiphy.debugfsdir)) debugfs_rename(rdev->wiphy.debugfsdir->d_parent, rdev->wiphy.debugfsdir, rdev->wiphy.debugfsdir->d_parent, newname); |