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

Commit d10c0858 authored by Heiko Carstens's avatar Heiko Carstens Committed by James Bottomley
Browse files

[SCSI] zfcp: fix kfree handling in zfcp_init_device_setup 



The pointer that is allocated with kmalloc() is passed to strsep()
which modifies it. Later on the modified pointer value will be passed
to kfree. Save the original pointer and pass that one to kfree
instead.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 37e6ba00

drivers/s390/scsi/zfcp_aux.c

+6 −5
Original line number Diff line number Diff line
@@ -128,12 +128,13 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) 
static void __init zfcp_init_device_setup(char *devstr)

{

	char *token;

	char *str;

	char *str, *str_saved;

	char busid[ZFCP_BUS_ID_SIZE];

	u64 wwpn, lun;



	/* duplicate devstr and keep the original for sysfs presentation*/

	str = kmalloc(strlen(devstr) + 1, GFP_KERNEL);

	str_saved = kmalloc(strlen(devstr) + 1, GFP_KERNEL);

	str = str_saved;

	if (!str)

		return;
@@ -152,12 +153,12 @@ static void __init zfcp_init_device_setup(char *devstr) 
	if (!token || strict_strtoull(token, 0, (unsigned long long *) &lun))

		goto err_out;



	kfree(str);

	kfree(str_saved);

	zfcp_init_device_configure(busid, wwpn, lun);

	return;



err_out:

	kfree(str);

	kfree(str_saved);

	pr_err("%s is not a valid SCSI device\n", devstr);

}