summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2022-08-26 09:33:35 +0200
committerAndrew Morton <akpm@linux-foundation.org>2022-09-12 06:55:10 +0200
commitf81259c6dbcefb255fa473090cd975f3827bca89 (patch)
tree6e1cfdd9761429c12e54a6b9790d4fa394e64afc /kernel
parentsmpboot: use atomic_try_cmpxchg in cpu_wait_death and cpu_report_death (diff)
downloadlinux-f81259c6dbcefb255fa473090cd975f3827bca89.tar.xz
linux-f81259c6dbcefb255fa473090cd975f3827bca89.zip
fail_function: switch to memdup_user_nul() helper
Use memdup_user_nul() helper instead of open-coding to simplify the code. Link: https://lkml.kernel.org/r/20220826073337.2085798-1-yangyingliang@huawei.com Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fail_function.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/kernel/fail_function.c b/kernel/fail_function.c
index 60dc825ecc2b..03643e33e4c3 100644
--- a/kernel/fail_function.c
+++ b/kernel/fail_function.c
@@ -247,15 +247,11 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
/* cut off if it is too long */
if (count > KSYM_NAME_LEN)
count = KSYM_NAME_LEN;
- buf = kmalloc(count + 1, GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
- if (copy_from_user(buf, buffer, count)) {
- ret = -EFAULT;
- goto out_free;
- }
- buf[count] = '\0';
+ buf = memdup_user_nul(buffer, count);
+ if (IS_ERR(buf))
+ return PTR_ERR(buf);
+
sym = strstrip(buf);
mutex_lock(&fei_lock);
@@ -308,7 +304,6 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
}
out:
mutex_unlock(&fei_lock);
-out_free:
kfree(buf);
return ret;
}