mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 04:12:04 -04:00
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()
This commit is contained in:
commit
fa4a6732a8
1 changed files with 1 additions and 1 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue