diff options
| author | Kirill Tkhai <ktkhai@virtuozzo.com> | 2018-02-13 10:26:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-13 16:36:04 +0100 |
| commit | 5ba049a5cc8e24a1643df75bbf65b4efa070fa74 (patch) | |
| tree | 268967536975bbe7f6bbb7d5db8154aad3871792 /net | |
| parent | net: Assign net to net_namespace_list in setup_net() (diff) | |
| download | linux-5ba049a5cc8e24a1643df75bbf65b4efa070fa74.tar.xz linux-5ba049a5cc8e24a1643df75bbf65b4efa070fa74.zip | |
net: Cleanup in copy_net_ns()
Line up destructors actions in the revers order
to constructors. Next patches will add more actions,
and this will be comfortable, if there is the such
order.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/net_namespace.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 1180c217895a..81384386f91b 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -411,27 +411,25 @@ struct net *copy_net_ns(unsigned long flags, net = net_alloc(); if (!net) { - dec_net_namespaces(ucounts); - return ERR_PTR(-ENOMEM); + rv = -ENOMEM; + goto dec_ucounts; } - + refcount_set(&net->passive, 1); + net->ucounts = ucounts; get_user_ns(user_ns); rv = mutex_lock_killable(&net_mutex); - if (rv < 0) { - net_free(net); - dec_net_namespaces(ucounts); - put_user_ns(user_ns); - return ERR_PTR(rv); - } + if (rv < 0) + goto put_userns; - net->ucounts = ucounts; rv = setup_net(net, user_ns); mutex_unlock(&net_mutex); if (rv < 0) { - dec_net_namespaces(ucounts); +put_userns: put_user_ns(user_ns); net_drop_ns(net); +dec_ucounts: + dec_net_namespaces(ucounts); return ERR_PTR(rv); } return net; |