diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2020-08-25 13:47:07 +0300 |
|---|---|---|
| committer |   Krzysztof Kozlowski <krzk@kernel.org> | 2020-08-26 20:22:12 +0200 |
| commit | 4c54228ac8fd55044195825873c50a524131fa53 (patch) | |
| tree | 9c701440abda15260fd9cbf356a5259272ff20eb /drivers/memory/omap-gpmc.c | |
| parent | memory: brcmstb_dpfe: fix array index out of bounds (diff) | |
| download | linux-dev-4c54228ac8fd55044195825873c50a524131fa53.tar.xz linux-dev-4c54228ac8fd55044195825873c50a524131fa53.zip | |
memory: omap-gpmc: Fix a couple off by ones
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>
Diffstat (limited to 'drivers/memory/omap-gpmc.c')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index ce0e7e2d7cff..2cd7ddf128ec 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -990,7 +990,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; } @@ -1025,7 +1025,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; } |