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:39:18 -0700 |
| commit | 65fd7aab590d38047cfafdfaac47282373bda37a (patch) | |
| tree | c7668c59bb1bb2e9ea6006d792b213cc88b46223 | |
| parent | afd8b04057818d14f6c01b7b83ecd2c03f073247 (diff) | |
| download | linux-stable-65fd7aab590d38047cfafdfaac47282373bda37a.tar.gz linux-stable-65fd7aab590d38047cfafdfaac47282373bda37a.tar.bz2 linux-stable-65fd7aab590d38047cfafdfaac47282373bda37a.zip | |
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 82910cc69ba3..0f0370f20264 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) |