lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 687/700] scsi: libfc: Correct the condition check and invalid argument passed
    Date
    From: Javed Hasan <jhasan@marvell.com>

    commit 8f70328c068f9f5c5db82848724cb276f657b9cd upstream.

    Incorrect condition check was leading to data corruption.

    Link: https://lore.kernel.org/r/20210603101404.7841-3-jhasan@marvell.com
    Fixes: 8fd9efca86d0 ("scsi: libfc: Work around -Warray-bounds warning")
    CC: stable@vger.kernel.org
    Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
    Signed-off-by: Javed Hasan <jhasan@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/scsi/libfc/fc_encode.h | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/scsi/libfc/fc_encode.h
    +++ b/drivers/scsi/libfc/fc_encode.h
    @@ -166,9 +166,11 @@ static inline int fc_ct_ns_fill(struct f
    static inline void fc_ct_ms_fill_attr(struct fc_fdmi_attr_entry *entry,
    const char *in, size_t len)
    {
    - int copied = strscpy(entry->value, in, len);
    - if (copied > 0)
    - memset(entry->value, copied, len - copied);
    + int copied;
    +
    + copied = strscpy((char *)&entry->value, in, len);
    + if (copied > 0 && (copied + 1) < len)
    + memset((entry->value + copied + 1), 0, len - copied - 1);
    }

    /**

    \
     
     \ /
      Last update: 2021-07-12 10:10    [W:4.076 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site