diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-05-27 19:07:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-13 11:03:41 -0700 |
| commit | 36c982c1c71b5bb35d06d46ffb82593bf8dbe8c7 (patch) | |
| tree | 72f071c7aba89c924dda1ef1e78b82d77f7ae8f8 | |
| parent | ffdae5d98228dfbf7479cb777853ca031fbdfd3d (diff) | |
SCSI: sd: Fix parsing of 'temporary ' cache mode prefix
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 <ben@decadent.org.uk>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 2bbb845fe40c..3141c1a7267a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -140,7 +140,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) |