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

Commit 674c3a99 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[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: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent f7bd7c36

drivers/s390/scsi/zfcp_aux.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

drivers/s390/scsi/zfcp_cfdc.c

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