lkml.org 
[lkml]   [2021]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 091/432] scsi: ufs: Fix memory corruption by ufshcd_read_desc_param()
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    [ Upstream commit d3d9c4570285090b533b00946b72647361f0345b ]

    If param_offset > buff_len then the memcpy() statement in
    ufshcd_read_desc_param() corrupts memory since it copies 256 + buff_len -
    param_offset bytes into a buffer with size buff_len. Since param_offset <
    256 this results in writing past the bound of the output buffer.

    Link: https://lore.kernel.org/r/20210722033439.26550-2-bvanassche@acm.org
    Fixes: cbe193f6f093 ("scsi: ufs: Fix potential NULL pointer access during memcpy")
    Reviewed-by: Avri Altman <avri.altman@wdc.com>
    Reviewed-by: Daejun Park <daejun7.park@samsung.com>
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/ufs/ufshcd.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
    index 708b3b62fc4d..179227180961 100644
    --- a/drivers/scsi/ufs/ufshcd.c
    +++ b/drivers/scsi/ufs/ufshcd.c
    @@ -3419,9 +3419,11 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,

    if (is_kmalloc) {
    /* Make sure we don't copy more data than available */
    - if (param_offset + param_size > buff_len)
    - param_size = buff_len - param_offset;
    - memcpy(param_read_buf, &desc_buf[param_offset], param_size);
    + if (param_offset >= buff_len)
    + ret = -EINVAL;
    + else
    + memcpy(param_read_buf, &desc_buf[param_offset],
    + min_t(u32, param_size, buff_len - param_offset));
    }
    out:
    if (is_kmalloc)
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-16 19:26    [W:4.064 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site