Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1633224

[PATCH] powerpc/nvram: use memdup_user

From Geliang Tang <geliangtang@gmail.com>
Newsgroups linux.kernel
Subject [PATCH] powerpc/nvram: use memdup_user
Date 2017-04-29 03:50 +0200
Message-ID <tBpGh-7H8-17@gated-at.bofh.it> (permalink)
References <tBpGh-7H8-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 arch/powerpc/kernel/nvram_64.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index eae61b0..496d639 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,
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH] cciss: use memdup_user Geliang Tang <geliangtang@gmail.com> - 2017-04-29 03:50 +0200
  [PATCH] powerpc/powernv: use memdup_user Geliang Tang <geliangtang@gmail.com> - 2017-04-29 03:50 +0200
  [PATCH] skd_main: use memdup_user Geliang Tang <geliangtang@gmail.com> - 2017-04-29 03:50 +0200
  [PATCH] powerpc/nvram: use memdup_user Geliang Tang <geliangtang@gmail.com> - 2017-04-29 03:50 +0200
  [PATCH] pstore: use memdup_user Geliang Tang <geliangtang@gmail.com> - 2017-04-29 03:50 +0200
  [PATCH] powerpc/pseries: use memdup_user_nul Geliang Tang <geliangtang@gmail.com> - 2017-04-29 03:50 +0200
  [PATCH] floppy: use memdup_user Geliang Tang <geliangtang@gmail.com> - 2017-04-29 03:50 +0200

csiph-web