Commit 8e2f8020 authored by Finn Thain's avatar Finn Thain Committed by Miquel Raynal
Browse files

mtd: Avoid boot crash in RedBoot partition table parser

Given CONFIG_FORTIFY_SOURCE=y and a recent compiler,
commit 439a1bca ("fortify: Use __builtin_dynamic_object_size() when
available") produces the warning below and an oops.

    Searching for RedBoot partition table in 50000000.flash at offset 0x7e0000
    ------------[ cut here ]------------
    WARNING: lib/string_helpers.c:1035 at 0xc029e04c, CPU#0: swapper/0/1
    memcmp: detected buffer overflow: 15 byte read of buffer size 14
    Modules linked in:
    CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.19.0 #1 NONE

As Kees said, "'names' is pointing to the final 'namelen' many bytes
of the allocation ... 'namelen' could be basically any length at all.
This fortify warning looks legit to me -- this code used to be reading
beyond the end of the allocation."

Since the size of the dynamic allocation is calculated with strlen()
we can use strcmp() instead of memcmp() and remain within bounds.

Cc: Kees Cook <kees@kernel.org>
Cc: stable@vger.kernel.org
Cc: linux-hardening@vger.kernel.org
Link: https://lore.kernel.org/all/202602151911.AD092DFFCD@keescook/


Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Suggested-by: default avatarKees Cook <kees@kernel.org>
Signed-off-by: default avatarFinn Thain <fthain@linux-m68k.org>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 82d938d5
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -270,9 +270,9 @@ static int parse_redboot_partitions(struct mtd_info *master,

		strcpy(names, fl->img->name);
#ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY
		if (!memcmp(names, "RedBoot", 8) ||
		    !memcmp(names, "RedBoot config", 15) ||
		    !memcmp(names, "FIS directory", 14)) {
		if (!strcmp(names, "RedBoot") ||
		    !strcmp(names, "RedBoot config") ||
		    !strcmp(names, "FIS directory")) {
			parts[i].mask_flags = MTD_WRITEABLE;
		}
#endif