Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

fa4a6732 · Linus Torvalds <[email protected]> · 2013-03-12 09:36:19 -07:00

Pull key management race fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  keys: fix race with concurrent install_user_keyrings()

Commit: fa4a6732a8e6153435941cb730d7d54c8367fe72
Parents: 368edaad · 0da9dfdd

Merge commit. Changes below are compared with the first parent: 368edaad.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
security/keys/process_keys.c	modified	+1	−1	View file

security/keys/process_keys.c

View file

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index a571fad..42defae 100644
--- 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;
 	}