| Message ID | 20240731200721.70601-5-kuniyu@amazon.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 930299491825575503ec411ff28473aaa6b8c9ca |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: Random cleanup for netns initialisation. | expand |
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 6c9acb086852..b91c15b27fb2 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -1199,8 +1199,9 @@ void __init net_ns_init(void) #ifdef CONFIG_KEYS init_net.key_domain = &init_net_key_domain; #endif - down_write(&pernet_ops_rwsem); preinit_net(&init_net); + + down_write(&pernet_ops_rwsem); if (setup_net(&init_net, &init_user_ns)) panic("Could not setup the initial network namespace");
When initialising the root netns, we call preinit_net() under pernet_ops_rwsem. However, the operations in preinit_net() do not require pernet_ops_rwsem. Also, we don't hold it for preinit_net() when initialising non-root netns. To be consistent, let's call preinit_net() without pernet_ops_rwsem in net_ns_init(). Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> --- net/core/net_namespace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)