Commit 4b767155 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 991657a3 4502403d

security/selinux/xfrm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;