openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Linus Torvalds 2013-03-12 09:36:19 -07:00
parent 368edaadc0 0da9dfdd2c
commit fa4a6732a8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/keys/process_keys.c
View File

@ -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;
}