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 4.19 193/264] memory: omap-gpmc: Fix a couple off by ones
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 4c54228ac8fd55044195825873c50a524131fa53 ]

    These comparisons should be >= instead of > to prevent reading one
    element beyond the end of the gpmc_cs[] array.

    Fixes: cdd6928c589a ("ARM: OMAP2+: Add device-tree support for NOR flash")
    Fixes: f37e4580c409 ("ARM: OMAP2: Dynamic allocator for GPMC memory space")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Roger Quadros <rogerq@ti.com>
    Link: https://lore.kernel.org/r/20200825104707.GB278587@mwanda
    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/memory/omap-gpmc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
    index 1c6a7c16e0c17..f5a89e78b7b2b 100644
    --- a/drivers/memory/omap-gpmc.c
    +++ b/drivers/memory/omap-gpmc.c
    @@ -951,7 +951,7 @@ static int gpmc_cs_remap(int cs, u32 base)
    int ret;
    u32 old_base, size;

    - if (cs > gpmc_cs_num) {
    + if (cs >= gpmc_cs_num) {
    pr_err("%s: requested chip-select is disabled\n", __func__);
    return -ENODEV;
    }
    @@ -986,7 +986,7 @@ int gpmc_cs_request(int cs, unsigned long size, unsigned long *base)
    struct resource *res = &gpmc->mem;
    int r = -1;

    - if (cs > gpmc_cs_num) {
    + if (cs >= gpmc_cs_num) {
    pr_err("%s: requested chip-select is disabled\n", __func__);
    return -ENODEV;
    }
    --
    2.25.1


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