Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0752e402 authored by Geliang Tang's avatar Geliang Tang Committed by Kees Cook
Browse files

powerpc/nvram: use memdup_user 



Use memdup_user() helper instead of open-coding to simplify the code.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 077090af

arch/powerpc/kernel/nvram_64.c

+5 −9
Original line number Diff line number Diff line
@@ -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,