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

[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
...@@ -128,12 +128,13 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) ...@@ -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) static void __init zfcp_init_device_setup(char *devstr)
{ {
char *token; char *token;
char *str; char *str, *str_saved;
char busid[ZFCP_BUS_ID_SIZE]; char busid[ZFCP_BUS_ID_SIZE];
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 = kmalloc(strlen(devstr) + 1, GFP_KERNEL); str_saved = kmalloc(strlen(devstr) + 1, GFP_KERNEL);
str = str_saved;
if (!str) if (!str)
return; return;
...@@ -152,12 +153,12 @@ static void __init zfcp_init_device_setup(char *devstr) ...@@ -152,12 +153,12 @@ static void __init zfcp_init_device_setup(char *devstr)
if (!token || strict_strtoull(token, 0, (unsigned long long *) &lun)) if (!token || strict_strtoull(token, 0, (unsigned long long *) &lun))
goto err_out; goto err_out;
kfree(str); kfree(str_saved);
zfcp_init_device_configure(busid, wwpn, lun); zfcp_init_device_configure(busid, wwpn, lun);
return; return;
err_out: err_out:
kfree(str); kfree(str_saved);
pr_err("%s is not a valid SCSI device\n", devstr); pr_err("%s is not a valid SCSI device\n", devstr);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment