X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fuser_namespace.c;h=240fb62cf3945aa0f7b601b343db65312a42f345;hb=55ef003e4ae684d5660f984eb2352df12572d9df;hp=13fb1134ba582e49c8aa3643feada72a2b0dae8b;hpb=ed24fee24a6be9568b1ee30209bafe4dad66be0e;p=~andy%2Flinux

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 13fb1134ba5..240fb62cf39 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -101,6 +101,9 @@ int create_user_ns(struct cred *new)
 
 	set_cred_user_ns(new, ns);
 
+#ifdef CONFIG_PERSISTENT_KEYRINGS
+	init_rwsem(&ns->persistent_keyring_register_sem);
+#endif
 	return 0;
 }
 
@@ -130,6 +133,9 @@ void free_user_ns(struct user_namespace *ns)
 
 	do {
 		parent = ns->parent;
+#ifdef CONFIG_PERSISTENT_KEYRINGS
+		key_put(ns->persistent_keyring_register);
+#endif
 		proc_free_inum(ns->proc_inum);
 		kmem_cache_free(user_ns_cachep, ns);
 		ns = parent;