Commit 33c0360b authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

cfg80211: fix debugfs error handling

If something goes wrong creating the debugfs dir or when
debugfs is not compiled in, the current code might lead to
trouble; make it more robust.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c74e90a9
...@@ -184,7 +184,8 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, ...@@ -184,7 +184,8 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
if (result) if (result)
goto out_unlock; goto out_unlock;
if (!debugfs_rename(rdev->wiphy.debugfsdir->d_parent, if (rdev->wiphy.debugfsdir &&
!debugfs_rename(rdev->wiphy.debugfsdir->d_parent,
rdev->wiphy.debugfsdir, rdev->wiphy.debugfsdir,
rdev->wiphy.debugfsdir->d_parent, rdev->wiphy.debugfsdir->d_parent,
newname)) newname))
...@@ -317,6 +318,8 @@ int wiphy_register(struct wiphy *wiphy) ...@@ -317,6 +318,8 @@ int wiphy_register(struct wiphy *wiphy)
drv->wiphy.debugfsdir = drv->wiphy.debugfsdir =
debugfs_create_dir(wiphy_name(&drv->wiphy), debugfs_create_dir(wiphy_name(&drv->wiphy),
ieee80211_debugfs_dir); ieee80211_debugfs_dir);
if (IS_ERR(drv->wiphy.debugfsdir))
drv->wiphy.debugfsdir = NULL;
res = 0; res = 0;
out_unlock: out_unlock:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment