1 files changed, 4 insertions, 3 deletions

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 923414a246e9..bda6e890ad88 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -133,6 +133,9 @@ int create_user_ns(struct cred *new)
         ns->flags = parent_ns->flags;
         mutex_unlock(&userns_state_mutex);
 
+#ifdef CONFIG_KEYS
+        INIT_LIST_HEAD(&ns->keyring_name_list);
+#endif
 #ifdef CONFIG_PERSISTENT_KEYRINGS
         init_rwsem(&ns->persistent_keyring_register_sem);
 #endif
@@ -196,9 +199,7 @@ static void free_user_ns(struct work_struct *work)
                         kfree(ns->projid_map.reverse);
                 }
                 retire_userns_sysctls(ns);
-#ifdef CONFIG_PERSISTENT_KEYRINGS
-                key_put(ns->persistent_keyring_register);
-#endif
+                key_free_user_ns(ns);
                 ns_free_inum(&ns->ns);
                 kmem_cache_free(user_ns_cachep, ns);
                 dec_user_namespaces(ucounts);