diff options
Diffstat (limited to 'security/keys/keyctl.c')
| -rw-r--r-- | security/keys/keyctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index ddb3e05bc5fc..21907ea35b15 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c | |||
| @@ -84,7 +84,7 @@ SYSCALL_DEFINE5(add_key, const char __user *, _type, | |||
| 84 | vm = false; | 84 | vm = false; |
| 85 | if (_payload) { | 85 | if (_payload) { |
| 86 | ret = -ENOMEM; | 86 | ret = -ENOMEM; |
| 87 | payload = kmalloc(plen, GFP_KERNEL); | 87 | payload = kmalloc(plen, GFP_KERNEL | __GFP_NOWARN); |
| 88 | if (!payload) { | 88 | if (!payload) { |
| 89 | if (plen <= PAGE_SIZE) | 89 | if (plen <= PAGE_SIZE) |
| 90 | goto error2; | 90 | goto error2; |
| @@ -1110,7 +1110,7 @@ long keyctl_instantiate_key_iov(key_serial_t id, | |||
| 1110 | goto no_payload; | 1110 | goto no_payload; |
| 1111 | 1111 | ||
| 1112 | ret = rw_copy_check_uvector(WRITE, _payload_iov, ioc, | 1112 | ret = rw_copy_check_uvector(WRITE, _payload_iov, ioc, |
| 1113 | ARRAY_SIZE(iovstack), iovstack, &iov, 1); | 1113 | ARRAY_SIZE(iovstack), iovstack, &iov); |
| 1114 | if (ret < 0) | 1114 | if (ret < 0) |
| 1115 | return ret; | 1115 | return ret; |
| 1116 | if (ret == 0) | 1116 | if (ret == 0) |
