lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 628/757] lightnvm: fix out-of-bounds write to array devices->info[]
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit a48faebe65b0db55a73b9220c3d919eee849bb79 ]

    There is an off-by-one array check that can lead to a out-of-bounds
    write to devices->info[i]. Fix this by checking by using >= rather
    than > for the size check. Also replace hard-coded array size limit
    with ARRAY_SIZE on the array.

    Addresses-Coverity: ("Out-of-bounds write")
    Fixes: cd9e9808d18f ("lightnvm: Support for Open-Channel SSDs")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/lightnvm/core.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
    index fe78bf0fdce54..c1bcac71008c6 100644
    --- a/drivers/lightnvm/core.c
    +++ b/drivers/lightnvm/core.c
    @@ -1311,8 +1311,9 @@ static long nvm_ioctl_get_devices(struct file *file, void __user *arg)
    strlcpy(info->bmname, "gennvm", sizeof(info->bmname));
    i++;

    - if (i > 31) {
    - pr_err("max 31 devices can be reported.\n");
    + if (i >= ARRAY_SIZE(devices->info)) {
    + pr_err("max %zd devices can be reported.\n",
    + ARRAY_SIZE(devices->info));
    break;
    }
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:40    [W:2.880 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site