diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 09:36:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 09:36:19 -0700 |
| commit | fa4a6732a8e6153435941cb730d7d54c8367fe72 (patch) | |
| tree | b274e271df524ce1e472e57e8efee2420e6be3e4 | |
| parent | 368edaadc0f68712848d761c9bcbb12480b61a39 (diff) | |
| parent | 0da9dfdd2cd9889201bc6f6f43580c99165cd087 (diff) | |
| download | linux-hexagon-kernel-fa4a6732a8e6153435941cb730d7d54c8367fe72.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
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()
| -rw-r--r-- | security/keys/process_keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index a571fad910101..42defae1e1616 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; } |