lkml.org 
[lkml]   [2013]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 59/98] [SCSI] sd: Fix parsing of 'temporary ' cache mode prefix
    Date
    3.5.7.17 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ben Hutchings <ben@decadent.org.uk>

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    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 45518b7..3977faa 100644
    --- a/drivers/scsi/sd.c
    +++ b/drivers/scsi/sd.c
    @@ -141,7 +141,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)
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-07-11 17:21    [W:3.330 / U:3.540 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site