This is patch 7 of 8 in a series of zfcp bug fixes. Patches are based
on 2.6.12-rc6 plus "remove flags_dump feature"-patch from June, 10th.
This one fixes module parameter parsing for "device" parameter.
The original module parameter was changed while parsing it.
This corrupted the output in sysfs (/sys/module/zfcp/parameters/device).
Regards,
Andreas
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
zfcp: fix module parameter parsing
Signed-off-by: Andreas Herrmann <aherrman@xxxxxxxxxx>
diff -u linux-2.6.12-rc6/drivers/s390/scsi-orig/zfcp_aux.c linux-2.6.12-rc6/drivers/s390/scsi/zfcp_aux.c
--- linux-2.6.12-rc6/drivers/s390/scsi-orig/zfcp_aux.c 2005-06-11 22:58:05.130151824 +0200
+++ linux-2.6.12-rc6/drivers/s390/scsi/zfcp_aux.c 2005-06-11 23:35:23.913804976 +0200
@@ -218,13 +218,20 @@
* Parse "device=..." parameter string.
*/
static int __init
-zfcp_device_setup(char *str)
+zfcp_device_setup(char *devstr)
{
- char *tmp;
+ char *tmp, *str;
+ size_t len;
- if (!str)
+ if (!devstr)
return 0;
+ len = strlen(devstr) + 1;
+ str = (char *) kmalloc(len, GFP_KERNEL);
+ if (!str)
+ goto err_out;
+ memcpy(str, devstr, len);
+
tmp = strchr(str, ',');
if (!tmp)
goto err_out;
@@ -241,10 +248,12 @@
zfcp_data.init_fcp_lun = simple_strtoull(tmp, &tmp, 0);
if (*tmp != '\0')
goto err_out;
+ kfree(str);
return 1;
err_out:
ZFCP_LOG_NORMAL("Parse error for device parameter string %s\n", str);
+ kfree(str);
return 0;
}
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
