diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2012-05-31 16:26:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 17:49:26 -0700 |
| commit | 4f1c28d241d0882f25112d494885cd6084db225b (patch) | |
| tree | 4332c441b47b3ce6f29b424d24923aebdc44d7eb | |
| parent | ecb41a77411358d385e3fde5b4e98a5f3d9cfdd5 (diff) | |
| download | linux-4f1c28d241d0882f25112d494885cd6084db225b.tar.gz linux-4f1c28d241d0882f25112d494885cd6084db225b.tar.bz2 linux-4f1c28d241d0882f25112d494885cd6084db225b.zip | |
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>
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |