Patchwork [042/145,SCSI] sd: Fix parsing of 'temporary ' cache mode prefix

mail settings
Submitter Kamal Mostafa
Date July 17, 2013, 10:46 p.m.
Message ID <>
Download mbox | patch
Permalink /patch/259869/
State New
Headers show


Kamal Mostafa - July 17, 2013, 10:46 p.m. -stable review patch.  If anyone has any objections, please let me know.


From: Ben Hutchings <>

commit 2ee3e26c673e75c05ef8b914f54fadee3d7b9c88 upstream.

Commit 39c60a0948cc '[SCSI] sd: fix array cache flushing bug causing
performance problems' added temp as a pointer to "temporary " and used
sizeof(temp) - 1 as its length.  But sizeof(temp) is the size of the
pointer, not the size of the string constant.  Change temp to a static
array so that sizeof() does what was intended.

Signed-off-by: Ben Hutchings <>
Signed-off-by: James Bottomley <>
Signed-off-by: Luis Henriques <>
 drivers/scsi/sd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 82910cc..0f0370f 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -142,7 +142,7 @@  sd_store_cache_type(struct device *dev, struct device_attribute *attr,
 	char *buffer_data;
 	struct scsi_mode_data data;
 	struct scsi_sense_hdr sshdr;
-	const char *temp = "temporary ";
+	static const char temp[] = "temporary ";
 	int len;
 	if (sdp->type != TYPE_DISK)