Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c1bfa73 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

cfg80211: fix debugfs rename crash 



commit 0bbab5f0301587cad4e923ccc49bb910db86162c upstream.

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: d82574a8 ("cfg80211: no need to check return value of debugfs_create functions")
Reported-by: default avatar <syzbot+fd5332e429401bf42d18@syzkaller.appspotmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20200525113816.fc4da3ec3d4b.Ica63a110679819eaa9fb3bc1b7437d96b1fd187d@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9cd0c83

net/wireless/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);