Commit 4f1c28d2 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

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: default avatarDave Jones <davej@redhat.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ecb41a77

security/keys/keyctl.c

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