Merge tag 'keys-namespace-20190627' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 78b17e36e705c2b81f76637b327c7f5a79e194ad..5235d7f49982e5e228256fe01b96164c41aa7b82 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -63,9 +63,9 @@ struct user_namespace init_user_ns = {
        .ns.ops = &userns_operations,
 #endif
        .flags = USERNS_INIT_FLAGS,
-#ifdef CONFIG_PERSISTENT_KEYRINGS
-       .persistent_keyring_register_sem =
-       __RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),
+#ifdef CONFIG_KEYS
+       .keyring_name_list = LIST_HEAD_INIT(init_user_ns.keyring_name_list),
+       .keyring_sem = __RWSEM_INITIALIZER(init_user_ns.keyring_sem),
 #endif
 };
 EXPORT_SYMBOL_GPL(init_user_ns);
@@ -141,8 +141,6 @@ static void free_user(struct user_struct *up, unsigned long flags)
 {
        uid_hash_remove(up);
        spin_unlock_irqrestore(&uidhash_lock, flags);
-       key_put(up->uid_keyring);
-       key_put(up->session_keyring);
        kmem_cache_free(uid_cachep, up);
 }