Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

user: Use generic ns_common::count

Switch over user namespaces to use the newly introduced common lifetime
counter.

Currently every namespace type has its own lifetime counter which is stored
in the specific namespace struct. The lifetime counters are used
identically for all namespaces types. Namespaces may of course have
additional unrelated counters and these are not altered.

This introduces a common lifetime counter into struct ns_common. The
ns_common struct encompasses information that all namespaces share. That
should include the lifetime counter since its common for all of them.

It also allows us to unify the type of the counters across all namespaces.
Most of them use refcount_t but one uses atomic_t and at least one uses
kref. Especially the last one doesn't make much sense since it's just a
wrapper around refcount_t since 2016 and actually complicates cleanup
operations by having to use container_of() to cast the correct namespace
struct out of struct ns_common.

Having the lifetime counter for the namespaces in one place reduces
maintenance cost. Not just because after switching all namespaces over we
will have removed more code than we added but also because the logic is
more easily understandable and we indicate to the user that the basic
lifetime requirements for all namespaces are currently identical.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/r/159644979754.604812.601625186726406922.stgit@localhost.localdomain
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

authored by

Kirill Tkhai and committed by
Christian Brauner
265cbd62 8eb71d95

+5 -6
+2 -3
include/linux/user_namespace.h
··· 57 57 struct uid_gid_map uid_map; 58 58 struct uid_gid_map gid_map; 59 59 struct uid_gid_map projid_map; 60 - atomic_t count; 61 60 struct user_namespace *parent; 62 61 int level; 63 62 kuid_t owner; ··· 108 109 static inline struct user_namespace *get_user_ns(struct user_namespace *ns) 109 110 { 110 111 if (ns) 111 - atomic_inc(&ns->count); 112 + refcount_inc(&ns->ns.count); 112 113 return ns; 113 114 } 114 115 ··· 118 119 119 120 static inline void put_user_ns(struct user_namespace *ns) 120 121 { 121 - if (ns && atomic_dec_and_test(&ns->count)) 122 + if (ns && refcount_dec_and_test(&ns->ns.count)) 122 123 __put_user_ns(ns); 123 124 } 124 125
+1 -1
kernel/user.c
··· 55 55 }, 56 56 }, 57 57 }, 58 - .count = ATOMIC_INIT(3), 58 + .ns.count = REFCOUNT_INIT(3), 59 59 .owner = GLOBAL_ROOT_UID, 60 60 .group = GLOBAL_ROOT_GID, 61 61 .ns.inum = PROC_USER_INIT_INO,
+2 -2
kernel/user_namespace.c
··· 111 111 goto fail_free; 112 112 ns->ns.ops = &userns_operations; 113 113 114 - atomic_set(&ns->count, 1); 114 + refcount_set(&ns->ns.count, 1); 115 115 /* Leave the new->user_ns reference with the new user namespace. */ 116 116 ns->parent = parent_ns; 117 117 ns->level = parent_ns->level + 1; ··· 197 197 kmem_cache_free(user_ns_cachep, ns); 198 198 dec_user_namespaces(ucounts); 199 199 ns = parent; 200 - } while (atomic_dec_and_test(&parent->count)); 200 + } while (refcount_dec_and_test(&parent->ns.count)); 201 201 } 202 202 203 203 void __put_user_ns(struct user_namespace *ns)