From: Oldřich Jedlička Date: Wed, 25 Sep 2019 19:45:42 +0000 (+0200) Subject: kernel: Fix off-by-one error in FIT mtd partition search. X-Git-Tag: v1.5.0-rc3~39 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7b0c93d8d2877c64963d70ca6d4c54c576d812f7;p=librecmc%2Flibrecmc.git kernel: Fix off-by-one error in FIT mtd partition search. This fixes off-by-one error introduced in commit dc76900021b8 ("kernel: Correctly search for the FIT image in mtd partition.") Function `mtd_read` starts reading at `offset` and needs `hdr_len` number of bytes to be available. Suppose the easiest case when `offset` is `0` and `hdr_len` equals to `mtd->size` - the `for` loop will not be entered even when enough bytes are available to be read. Same happens for any non-zero `offset`, when `hdr_len` is just enough bytes to be read until `mtd->size` is reached. Imagine that for example `mtd->size=5`, `offset=4` and `hdr_len=1`. Then `offset+hdr_len=5` and the check has to be `offset+hdr_len <= mtd->size`, i.e. `5 <= 5`. The check for `offset + hdr_len` value needs to be inclusive, therefore use `<=`. Fixes: dc76900021b8 ("kernel: Correctly search for the FIT image in mtd partition.") Signed-off-by: Oldřich Jedlička [adjusted commit ref, fixes tag] Signed-off-by: Petr Štetiar (cherry picked from commit e0ce80d42ace6feba509da16795ab0eb81cf5bf4) --- 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 d206fecd5b..67ee33d085 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c @@ -60,7 +60,7 @@ 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 + hdr_len < mtd->size; offset += mtd->erasesize) { + 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",