summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-05-13 18:15:25 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-06-30 02:04:07 -0400
commit02412e9b4e54e124fe0890b30b891d3e6f3adf38 (patch)
tree2adb7eb71d4702ca6169d4e0e668fd83a554ed5e /security
parent0b884d25f5212bd0323d179c570962bbf822e330 (diff)
downloadlinux-stable-02412e9b4e54e124fe0890b30b891d3e6f3adf38.tar.gz
linux-stable-02412e9b4e54e124fe0890b30b891d3e6f3adf38.tar.bz2
linux-stable-02412e9b4e54e124fe0890b30b891d3e6f3adf38.zip
ima_write_policy(): don't open-code memdup_user_nul()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_fs.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index ca303e5d2b94..ad491c51e833 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -323,16 +323,11 @@ static ssize_t ima_write_policy(struct file *file, const char __user *buf,
if (*ppos != 0)
goto out;
- result = -ENOMEM;
- data = kmalloc(datalen + 1, GFP_KERNEL);
- if (!data)
+ data = memdup_user_nul(buf, datalen);
+ if (IS_ERR(data)) {
+ result = PTR_ERR(data);
goto out;
-
- *(data + datalen) = '\0';
-
- result = -EFAULT;
- if (copy_from_user(data, buf, datalen))
- goto out_free;
+ }
result = mutex_lock_interruptible(&ima_write_mutex);
if (result < 0)