diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 08:26:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 08:26:15 -0700 |
| commit | 4b767155ffad4be0aaafeead585ad21375dc7475 (patch) | |
| tree | e1985f52fd4807cb9d85b975fbd42ea0795ccf13 | |
| parent | 991657a39dff76c81e7dbcd0b1f8e56a0ff36aa7 (diff) | |
| parent | 4502403dcf8f5c76abd4dbab8726c8e4ecb5cd34 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull selinux bugfix from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
selinux: use GFP_ATOMIC under spin_lock
| -rw-r--r-- | security/selinux/xfrm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index 48665ecd119..8ab29515451 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; |