diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2024-07-31 13:07:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-08-03 22:38:44 +0100 |
| commit | 2b5afc1d5d5a33060034f0f275bc0e9c243394bb (patch) | |
| tree | 2d809f255e08735908404c6f9545bed75c6b1c1e /net | |
| parent | 768e4bb6a75e3c6a034df7c67edac20bd222857e (diff) | |
net: Initialise net->passive once in preinit_net().
When initialising the root netns, we set net->passive in setup_net().
However, we do it twice for non-root netns in copy_net_ns() and
setup_net().
This is because we could bypass setup_net() in copy_net_ns() if
down_read_killable() fails.
preinit_net() is a better place to put such an operation.
Let's initialise net->passive in preinit_net().
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/net_namespace.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 1cd87df13f39..6c9acb086852 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -312,6 +312,7 @@ EXPORT_SYMBOL_GPL(get_net_ns_by_id); /* init code that must occur even if setup_net() is not called. */ static __net_init void preinit_net(struct net *net) { + refcount_set(&net->passive, 1); ref_tracker_dir_init(&net->notrefcnt_tracker, 128, "net notrefcnt"); } @@ -329,7 +330,6 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns) refcount_set(&net->ns.count, 1); ref_tracker_dir_init(&net->refcnt_tracker, 128, "net refcnt"); - refcount_set(&net->passive, 1); get_random_bytes(&net->hash_mix, sizeof(u32)); preempt_disable(); net->net_cookie = gen_cookie_next(&net_cookie); @@ -498,7 +498,6 @@ struct net *copy_net_ns(unsigned long flags, } preinit_net(net); - refcount_set(&net->passive, 1); net->ucounts = ucounts; get_user_ns(user_ns); |