From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 31 May 2012 23:26:02 +0000 (-0700)
Subject: security/keys/keyctl.c: suppress memory allocation failure warning
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4f1c28d241d0882f25112d494885cd6084db225b;p=openwrt%2Fstaging%2Fblogic.git

security/keys/keyctl.c: suppress memory allocation failure warning

This allocation may be large.  The code is probing to see if it will
succeed and if not, it falls back to vmalloc().  We should suppress any
page-allocation failure messages when the fallback happens.

Reported-by: Dave Jones <davej@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index ddb3e05bc5fc..18f29de88fda 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -84,7 +84,7 @@ SYSCALL_DEFINE5(add_key, const char __user *, _type,
 	vm = false;
 	if (_payload) {
 		ret = -ENOMEM;
-		payload = kmalloc(plen, GFP_KERNEL);
+		payload = kmalloc(plen, GFP_KERNEL | __GFP_NOWARN);
 		if (!payload) {
 			if (plen <= PAGE_SIZE)
 				goto error2;