From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Boris Brezillon <boris.brezillon@bootlin.com>,
Marek Vasut <marek.vasut@gmail.com>,
Richard Weinberger <richard@nod.at>,
Linus Walleij <linus.walleij@linaro.org>
Cc: linux-mtd@lists.infradead.org, linux-mips@linux-mips.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH next] mtd: maps: physmap: Fix infinite loop crash in ROM type probing
Date: Tue, 6 Nov 2018 22:44:16 +0100 [thread overview]
Message-ID: <20181106214416.11342-1-geert@linux-m68k.org> (raw)
On Toshiba RBTX4927, where map_probe is supposed to fail:
Creating 2 MTD partitions on "physmap-flash.0":
0x000000c00000-0x000001000000 : "boot"
0x000000000000-0x000000c00000 : "user"
physmap-flash physmap-flash.1: physmap platform flash device: [mem 0x1e000000-0x1effffff]
CPU 0 Unable to handle kernel paging request at virtual address 00000000, epc == 80320f40, ra == 80321004
...
Call Trace:
[<80320f40>] get_mtd_chip_driver+0x30/0x8c
[<80321004>] do_map_probe+0x20/0x90
[<80328448>] physmap_flash_probe+0x484/0x4ec
The access to rom_probe_types[] was changed from a sentinel-based loop
to an infinite loop, causing a crash when reaching the sentinel.
Fix this by:
- Removing the no longer needed sentinel,
- Limiting the number of loop iterations to the actual number of ROM
types.
Fixes: c7afe08496fa463e ("mtd: maps: physmap: Invert logic on if/else branch")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/mtd/maps/physmap-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index 33b77bd9022ce251..e8c3b250d8421edc 100644
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -396,7 +396,7 @@ static int physmap_flash_of_init(struct platform_device *dev)
#endif /* IS_ENABLED(CONFIG_MTD_PHYSMAP_OF) */
static const char * const rom_probe_types[] = {
- "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL
+ "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom",
};
static const char * const part_probe_types[] = {
@@ -524,7 +524,7 @@ static int physmap_flash_probe(struct platform_device *dev)
} else {
int j;
- for (j = 0; ARRAY_SIZE(rom_probe_types); j++) {
+ for (j = 0; j < ARRAY_SIZE(rom_probe_types); j++) {
info->mtds[i] = do_map_probe(rom_probe_types[j],
&info->maps[i]);
if (info->mtds[i])
--
2.17.1
next reply other threads:[~2018-11-06 21:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 21:44 Geert Uytterhoeven [this message]
2018-11-06 21:58 ` [PATCH next] mtd: maps: physmap: Fix infinite loop crash in ROM type probing Boris Brezillon
2018-11-06 22:19 ` Geert Uytterhoeven
2018-11-06 22:34 ` Boris Brezillon
2018-11-07 7:33 ` Ricardo Ribalda Delgado
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181106214416.11342-1-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=boris.brezillon@bootlin.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=ricardo.ribalda@gmail.com \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).