UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Christof Schmitt 2010-07-16 15:37:34 +02:00 committed by James Bottomley
parent f7bd7c3627
commit 674c3a993c
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/s390/scsi/zfcp_aux.c
View File

@ -98,13 +98,11 @@ static void __init zfcp_init_device_setup(char *devstr)
u64 wwpn, lun; u64 wwpn, lun;
/* duplicate devstr and keep the original for sysfs presentation*/ /* 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; str = str_saved;
if (!str) if (!str)
return; return;
strcpy(str, devstr);
token = strsep(&str, ","); token = strsep(&str, ",");
if (!token || strlen(token) >= ZFCP_BUS_ID_SIZE) if (!token || strlen(token) >= ZFCP_BUS_ID_SIZE)
goto err_out; goto err_out;

12
drivers/s390/scsi/zfcp_cfdc.c
View File

@ -189,18 +189,12 @@ static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
if (!fsf_cfdc) if (!fsf_cfdc)
return -ENOMEM; return -ENOMEM;
data = kmalloc(sizeof(struct zfcp_cfdc_data), GFP_KERNEL); data = memdup_user(data_user, sizeof(*data_user));
if (!data) { if (IS_ERR(data)) {
retval = -ENOMEM; retval = PTR_ERR(data);
goto no_mem_sense; goto no_mem_sense;
} }
retval = copy_from_user(data, data_user, sizeof(*data));
if (retval) {
retval = -EFAULT;
goto free_buffer;
}
if (data->signature != 0xCFDCACDF) { if (data->signature != 0xCFDCACDF) {
retval = -EINVAL; retval = -EINVAL;
goto free_buffer; goto free_buffer;