diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2017-05-06 23:40:18 +0800 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2017-06-21 14:37:12 -0400 |
| commit | b4e280304ddb2fb5b6970524e901fc8ae8ec6337 (patch) | |
| tree | 14f5444897b285b272ce18e8573f5f908e6b6683 /security | |
| parent | 5d659f286d58d76064168c4cd7aad61a30d20c44 (diff) | |
| download | op-kernel-dev-b4e280304ddb2fb5b6970524e901fc8ae8ec6337.zip op-kernel-dev-b4e280304ddb2fb5b6970524e901fc8ae8ec6337.tar.gz | |
ima: use memdup_user_nul
Use memdup_user_nul() helper instead of open-coding to simplify the
code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_fs.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index ca303e5..ad491c5 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) |
