From: Fredrik Olofsson Date: Wed, 4 Sep 2019 08:41:22 +0000 (+0200) Subject: kernel: Correctly search for the FIT image in mtd partition. X-Git-Tag: v1.5.0-rc3~40 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f3e4bd0577709b16c66f6e272556058e310bec60;p=librecmc%2Flibrecmc.git kernel: Correctly search for the FIT image in mtd partition. Previously all iterations of the loop checked offset=0 in the partition. Signed-off-by: Fredrik Olofsson (cherry picked from commit dc76900021b880820adf981bb7b1cf5ff3ffe1fd) --- diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c index f9e5e53a95..d206fecd5b 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c @@ -60,8 +60,8 @@ mtdsplit_fit_parse(struct mtd_info *mtd, hdr_len = sizeof(struct fdt_header); /* Parse the MTD device & search for the FIT image location */ - for(offset = 0; offset < mtd->size; offset += mtd->erasesize) { - ret = mtd_read(mtd, 0, hdr_len, &retlen, (void*) &hdr); + for(offset = 0; offset + hdr_len < mtd->size; offset += mtd->erasesize) { + ret = mtd_read(mtd, offset, hdr_len, &retlen, (void*) &hdr); if (ret) { pr_err("read error in \"%s\" at offset 0x%llx\n", mtd->name, (unsigned long long) offset);