The following commit has been merged in the linux branch: commit d10c0858f618c20547d4eda8aee9c3afd91599cf Author: Heiko Carstens heiko.carstens@de.ibm.com Date: Tue Oct 13 10:44:07 2009 +0200
[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: Heiko Carstens heiko.carstens@de.ibm.com Signed-off-by: Christof Schmitt christof.schmitt@de.ibm.com Signed-off-by: James Bottomley James.Bottomley@suse.de
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 0f79f3a..2889e5f 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c @@ -128,12 +128,13 @@ out_ccwdev: 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); +err_out: + kfree(str_saved); pr_err("%s is not a valid SCSI device\n", devstr); }