Эх сурвалжийг харах

cfg80211: fix wiphy_register error path

If rfkill_register() fails in wiphy_register() the struct device
is unregistered but everything else isn't (regulatory, debugfs)
and we even leave the wiphy instance on all internal lists even
though it will likely be freed soon, which is clearly a problem.
Fix this by cleaning up properly.

Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Johannes Berg 12 жил өмнө
parent
commit
03cd7e4e1e

+ 10 - 6
net/wireless/core.c

@@ -638,17 +638,21 @@ int wiphy_register(struct wiphy *wiphy)
 	 * cfg80211_mutex lock
 	 * cfg80211_mutex lock
 	 */
 	 */
 	res = rfkill_register(rdev->rfkill);
 	res = rfkill_register(rdev->rfkill);
-	if (res)
-		goto out_rm_dev;
+	if (res) {
+		device_del(&rdev->wiphy.dev);
+
+		mutex_lock(&cfg80211_mutex);
+		debugfs_remove_recursive(rdev->wiphy.debugfsdir);
+		list_del_rcu(&rdev->list);
+		wiphy_regulatory_deregister(wiphy);
+		mutex_unlock(&cfg80211_mutex);
+		return res;
+	}
 
 
 	rtnl_lock();
 	rtnl_lock();
 	rdev->wiphy.registered = true;
 	rdev->wiphy.registered = true;
 	rtnl_unlock();
 	rtnl_unlock();
 	return 0;
 	return 0;
-
-out_rm_dev:
-	device_del(&rdev->wiphy.dev);
-	return res;
 }
 }
 EXPORT_SYMBOL(wiphy_register);
 EXPORT_SYMBOL(wiphy_register);