memory: omap-gpmc: Fix a couple off by ones
[ Upstream commit5.4-rM2-2.2.x-imx-squashed4c54228ac8
] These comparisons should be >= instead of > to prevent reading one element beyond the end of the gpmc_cs[] array. Fixes:cdd6928c58
("ARM: OMAP2+: Add device-tree support for NOR flash") Fixes:f37e4580c4
("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>
parent
8426055fc9
commit
afb15453ca
|
@ -949,7 +949,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;
|
||||
}
|
||||
|
@ -984,7 +984,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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue