Skip to content

Commit 2b5afc1

Browse files
q2vendavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 768e4bb commit 2b5afc1

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

net/core/net_namespace.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ EXPORT_SYMBOL_GPL(get_net_ns_by_id);
312312
/* init code that must occur even if setup_net() is not called. */
313313
static __net_init void preinit_net(struct net *net)
314314
{
315+
refcount_set(&net->passive, 1);
315316
ref_tracker_dir_init(&net->notrefcnt_tracker, 128, "net notrefcnt");
316317
}
317318

@@ -329,7 +330,6 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns)
329330
refcount_set(&net->ns.count, 1);
330331
ref_tracker_dir_init(&net->refcnt_tracker, 128, "net refcnt");
331332

332-
refcount_set(&net->passive, 1);
333333
get_random_bytes(&net->hash_mix, sizeof(u32));
334334
preempt_disable();
335335
net->net_cookie = gen_cookie_next(&net_cookie);
@@ -498,7 +498,6 @@ struct net *copy_net_ns(unsigned long flags,
498498
}
499499

500500
preinit_net(net);
501-
refcount_set(&net->passive, 1);
502501
net->ucounts = ucounts;
503502
get_user_ns(user_ns);
504503

0 commit comments

Comments
 (0)