keys: fix race with concurrent install_user_keyrings()

[GitHub/LineageOS/android_kernel_samsung_universal7580.git] / security / keys / process_keys.c

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index a571fad91010156aa7c532836b2a612e8e82e6fd..42defae1e161632e93b13b8194af1a30a09f2492 100644 (file)
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -57,7 +57,7 @@ int install_user_keyrings(void)
 
        kenter("%p{%u}", user, uid);
 
-       if (user->uid_keyring) {
+       if (user->uid_keyring && user->session_keyring) {
                kleave(" = 0 [exist]");
                return 0;
        }