]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mtd: maps: gpio-addr-flash: Fix ioremapped size
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Thu, 4 Oct 2018 13:01:04 +0000 (15:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2018 19:08:14 +0000 (11:08 -0800)
commit 6c925b333368cda4e1b0513b07f72316c0e7edd7 upstream.

We should only iomap the area of the chip that is memory mapped.
Otherwise we could be mapping devices beyond the memory space or that
belong to other devices.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Fixes: ebd71e3a4861 ("mtd: maps: gpio-addr-flash: fix warnings and make more portable")
Cc: <stable@vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mtd/maps/gpio-addr-flash.c

index 9d972369321755b5560c371626d9c8bf9a8d8271..2e3a8da3ce72c9ab6545d0da540dd0d42c2783d7 100644 (file)
@@ -238,7 +238,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
        state->map.copy_to    = gf_copy_to;
        state->map.bankwidth  = pdata->width;
        state->map.size       = state->win_size * (1 << state->gpio_count);
-       state->map.virt       = ioremap_nocache(memory->start, state->map.size);
+       state->map.virt       = ioremap_nocache(memory->start, state->win_size);
        if (!state->map.virt)
                return -ENOMEM;