diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2017-04-29 09:45:13 +0800 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-06-27 17:02:50 -0700 |
| commit | 0752e4028c003fba1e2b44c4b3cf6a4482e931b6 (patch) | |
| tree | 9ab17526e20f992cb4fc4471a0b12f740af2c436 | |
| parent | 077090af337f7d833f82be3d556549512398de66 (diff) | |
powerpc/nvram: use memdup_user
Use memdup_user() helper instead of open-coding to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | arch/powerpc/kernel/nvram_64.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index eae61b044e9e..496d6393bd41 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -792,21 +792,17 @@ static ssize_t dev_nvram_write(struct file *file, const char __user *buf, count = min_t(size_t, count, size - *ppos); count = min(count, PAGE_SIZE); - ret = -ENOMEM; - tmp = kmalloc(count, GFP_KERNEL); - if (!tmp) - goto out; - - ret = -EFAULT; - if (copy_from_user(tmp, buf, count)) + tmp = memdup_user(buf, count); + if (IS_ERR(tmp)) { + ret = PTR_ERR(tmp); goto out; + } ret = ppc_md.nvram_write(tmp, count, ppos); -out: kfree(tmp); +out: return ret; - } static long dev_nvram_ioctl(struct file *file, unsigned int cmd, |