diff mbox series

[NET-PREV,50/51] cfg80211: Call dev_change_net_namespace() under nd_lock

Message ID 174265464459.356712.3761967966551081034.stgit@pro.pro (mailing list archive)
State RFC
Delegated to: Netdev Maintainers
Headers show
Series Kill rtnl_lock using fine-grained nd_lock | expand

Checks

Context Check Description
netdev/tree_selection success Guessing tree name failed - patch did not apply, async

Commit Message

Kirill Tkhai March 22, 2025, 2:44 p.m. UTC 
We want to provide "nd_lock is locked" context during
NETDEV_REGISTER (and later for NETDEV_UNREGISTER)
events. When calling from __register_netdevice(),
notifiers are already in that context, and we do the
same for dev_change_net_namespace() here.

Signed-off-by: Kirill Tkhai <tkhai@ya.ru>
---
 net/wireless/core.c    |    2 ++
 net/wireless/nl80211.c |    1 +
 2 files changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 8ba0ada86678..c661bba9fc7b 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1605,10 +1605,12 @@  static void __net_exit cfg80211_pernet_exit(struct net *net)
 	struct cfg80211_registered_device *rdev;
 
 	rtnl_lock();
+	mutex_lock(&fallback_nd_lock.mutex);
 	for_each_rdev(rdev) {
 		if (net_eq(wiphy_net(&rdev->wiphy), net))
 			WARN_ON(cfg80211_switch_netns(rdev, &init_net));
 	}
+	mutex_unlock(&fallback_nd_lock.mutex);
 	rtnl_unlock();
 }
 
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 0fd66f75eace..f8bd7c72bd3e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -17136,6 +17136,7 @@  static const struct genl_small_ops nl80211_small_ops[] = {
 		.doit = nl80211_wiphy_netns,
 		.flags = GENL_UNS_ADMIN_PERM,
 		.internal_flags = IFLAGS(NL80211_FLAG_NEED_WIPHY |
+					 NL80211_FLAG_NEED_FALLBACK_ND_LOCK |
 					 NL80211_FLAG_NEED_RTNL |
 					 NL80211_FLAG_NO_WIPHY_MTX),
 	},