lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 13 Feb 2018 12:26:13 +0300 From: Kirill Tkhai <ktkhai@...tuozzo.com> To: davem@...emloft.net, vyasevic@...hat.com, kstewart@...uxfoundation.org, pombredanne@...b.com, vyasevich@...il.com, mark.rutland@....com, gregkh@...uxfoundation.org, adobriyan@...il.com, fw@...len.de, nicolas.dichtel@...nd.com, xiyou.wangcong@...il.com, roman.kapl@...go.com, paul@...l-moore.com, dsahern@...il.com, daniel@...earbox.net, lucien.xin@...il.com, mschiffer@...verse-factory.net, rshearma@...cade.com, netdev@...r.kernel.org, ktkhai@...tuozzo.com, ebiederm@...ssion.com, avagin@...tuozzo.com, gorcunov@...tuozzo.com, eric.dumazet@...il.com, stephen@...workplumber.org, ktkhai@...tuozzo.com Subject: [PATCH net-next v3 02/32] 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@...tuozzo.com> Acked-by: Andrei Vagin <avagin@...tuozzo.com> --- net/core/net_namespace.c | 20 +++++++++----------- 1 file 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;
Powered by blists - more mailing lists