Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 4b767155ff - Gogs

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

Linus Torvalds 12 years ago

parent

991657a39d 4502403dcf

commit

4b767155ff

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
security/selinux/xfrm.c
							 
								View File
							
				@@ -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;