[SCSI] zfcp: Use memdup_user and kstrdup

Use the functions memdup_user and kstrdup to allocate memory and copy
the data in one step, saving some lines of code.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

2 files changed, 4 insertions, 12 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 6e9c7f33e276..7c01c4c3f6b9 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -98,13 +98,11 @@ static void __init zfcp_init_device_setup(char *devstr)
         u64 wwpn, lun;
 
         /* duplicate devstr and keep the original for sysfs presentation*/
-        str_saved = kmalloc(strlen(devstr) + 1, GFP_KERNEL);
+        str_saved = kstrdup(devstr, GFP_KERNEL);
         str = str_saved;
         if (!str)
                 return;
 
-        strcpy(str, devstr);
-
         token = strsep(&str, ",");
         if (!token || strlen(token) >= ZFCP_BUS_ID_SIZE)
                 goto err_out;
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c
index 1a2db0a35737..fcbd2b756da4 100644
--- a/drivers/s390/scsi/zfcp_cfdc.c
+++ b/drivers/s390/scsi/zfcp_cfdc.c
@@ -189,18 +189,12 @@ static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
         if (!fsf_cfdc)
                 return -ENOMEM;
 
-        data = kmalloc(sizeof(struct zfcp_cfdc_data), GFP_KERNEL);
-        if (!data) {
-                retval = -ENOMEM;
+        data = memdup_user(data_user, sizeof(*data_user));
+        if (IS_ERR(data)) {
+                retval = PTR_ERR(data);
                 goto no_mem_sense;
         }
 
-        retval = copy_from_user(data, data_user, sizeof(*data));
-        if (retval) {
-                retval = -EFAULT;
-                goto free_buffer;
-        }
-
         if (data->signature != 0xCFDCACDF) {
                 retval = -EINVAL;
                 goto free_buffer;