diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-21 14:02:44 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-21 14:03:15 +0700 |
| commit | 99fed99a60000dcf75842a88103bfb513511cdd8 (patch) | |
| tree | 3daa2950331a080c0292916a63e6b6e0056a365e /security | |
| parent | cdf733ed16cf85e9d89ed45f0eceb060f77955fd (diff) | |
| parent | ef4fb40e21750ad9c3d1b017c61a9a69701039ff (diff) | |
| download | kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.zip kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.gz kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.bz2 | |
Merge 3.0.70
Change-Id: I4316261b071ad622fcf62dcae7874c2ea6d9604d
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/process_keys.c | 2 | ||||
| -rw-r--r-- | security/selinux/xfrm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index a3063eb..44a5100 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -54,7 +54,7 @@ int install_user_keyrings(void) kenter("%p{%u}", user, user->uid); - if (user->uid_keyring) { + if (user->uid_keyring && user->session_keyring) { kleave(" = 0 [exist]"); return 0; } diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index 68178b7..1df278c 100644 --- a/security/selinux/xfrm.c +++ b/security/selinux/xfrm.c @@ -310,7 +310,7 @@ int selinux_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx, if (old_ctx) { new_ctx = kmalloc(sizeof(*old_ctx) + old_ctx->ctx_len, - GFP_KERNEL); + GFP_ATOMIC); if (!new_ctx) return -ENOMEM; |