diff options
Diffstat (limited to 'security/keys/process_keys.c')
-rw-r--r-- | security/keys/process_keys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 58dfe0890947..42defae1e161 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c | |||
@@ -57,7 +57,7 @@ int install_user_keyrings(void) | |||
57 | 57 | ||
58 | kenter("%p{%u}", user, uid); | 58 | kenter("%p{%u}", user, uid); |
59 | 59 | ||
60 | if (user->uid_keyring) { | 60 | if (user->uid_keyring && user->session_keyring) { |
61 | kleave(" = 0 [exist]"); | 61 | kleave(" = 0 [exist]"); |
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
@@ -839,7 +839,7 @@ void key_change_session_keyring(struct callback_head *twork) | |||
839 | new-> sgid = old-> sgid; | 839 | new-> sgid = old-> sgid; |
840 | new->fsgid = old->fsgid; | 840 | new->fsgid = old->fsgid; |
841 | new->user = get_uid(old->user); | 841 | new->user = get_uid(old->user); |
842 | new->user_ns = get_user_ns(new->user_ns); | 842 | new->user_ns = get_user_ns(old->user_ns); |
843 | new->group_info = get_group_info(old->group_info); | 843 | new->group_info = get_group_info(old->group_info); |
844 | 844 | ||
845 | new->securebits = old->securebits; | 845 | new->securebits = old->securebits; |