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


Groups > linux.kernel > #1633228

[PATCH] floppy: use memdup_user

From Geliang Tang <geliangtang@gmail.com>
Newsgroups linux.kernel
Subject [PATCH] floppy: use memdup_user
Date 2017-04-29 03:50 +0200
Message-ID <tBpGi-7H8-21@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>
---
 drivers/block/floppy.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 60d4c76..167426c 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3121,16 +3121,13 @@ static int raw_cmd_copyin(int cmd, void __user *param,
 	*rcmd = NULL;
 
 loop:
-	ptr = kmalloc(sizeof(struct floppy_raw_cmd), GFP_KERNEL);
-	if (!ptr)
-		return -ENOMEM;
+	ptr = memdup_user(param, sizeof(*ptr));
+	if (IS_ERR(ptr))
+		return PTR_ERR(ptr);
 	*rcmd = ptr;
-	ret = copy_from_user(ptr, param, sizeof(*ptr));
 	ptr->next = NULL;
 	ptr->buffer_length = 0;
 	ptr->kernel_data = NULL;
-	if (ret)
-		return -EFAULT;
 	param += sizeof(struct floppy_raw_cmd);
 	if (ptr->cmd_count > 33)
 			/* the command may now also take up the space
-- 
2.9.3

Back to linux.kernel | Previous | NextPrevious 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