catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

kernel: mtdsplit: rework and make use of -ENOENT error

Browse Source 
Rework each affected mtdsplit driver to make use of -ENOENT error
instead of -ENODEV to handle new kernel that checks error from parser on
subpartitions.

The only acceptable error is -ENOENT that skip the parser. This follow
pattern used upstream and also by an mtdsplit parser, mtdsplit_bcm_wfi,
and also by a workaround currently implemented for mtdsplit_mstc_boot.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2025-11-18 13:07:59 +01:00
parent 1db7ed390d
commit e5ad92c588
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: AC001D09ADBFEAD7
8 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c
View File

@ -53,7 +53,7 @@ int mtd_get_squashfs_len(struct mtd_info *master,
retlen = le64_to_cpu(sb.bytes_used);
if (retlen <= 0) {
pr_alert("squashfs is empty in \"%s\"\n", master->name);
return -ENODEV;
return -ENOENT;
}
if (offset + retlen > master->size) {
@ -124,7 +124,7 @@ int mtd_find_rootfs_from(struct mtd_info *mtd,
return 0;
}
return -ENODEV;
return -ENOENT;
}
EXPORT_SYMBOL_GPL(mtd_find_rootfs_from);

4
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h
View File

@ -45,7 +45,7 @@ static inline int mtd_get_squashfs_len(struct mtd_info *master,
size_t offset,
size_t *squashfs_len)
{
return -ENODEV;
return -ENOENT;
}
static inline int mtd_check_rootfs_magic(struct mtd_info *mtd, size_t offset,
@ -60,7 +60,7 @@ static inline int mtd_find_rootfs_from(struct mtd_info *mtd,
size_t *ret_offset,
enum mtdsplit_part_type *type)
{
return -ENODEV;
return -ENOENT;
}
#endif /* CONFIG_MTD_SPLIT */

2
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_elf.c
View File

@ -241,7 +241,7 @@ static int mtdsplit_parse_elf(struct mtd_info *mtd,
if (rootfs_offset == mtd->size) {
pr_debug("no rootfs found in \"%s\"\n", mtd->name);
return -ENODEV;
return -ENOENT;
}
parts = kzalloc(ELF_NR_PARTS * sizeof(*parts), GFP_KERNEL);

6
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c
View File

@ -210,7 +210,7 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
of_property_read_string(np, "openwrt,cmdline-match", &cmdline_match);
if (cmdline_match && !strstr(saved_command_line, cmdline_match))
return -ENODEV;
return -ENOENT;
of_property_read_u32(np, "openwrt,fit-offset", &offset_start);
@ -247,7 +247,7 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
if (fit_size == 0) {
pr_err("FIT image in \"%s\" at offset %llx has null size\n",
mtd->name, (unsigned long long) fit_offset);
return -ENODEV;
return -ENOENT;
}
/*
@ -304,7 +304,7 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
if (images_noffset < 0) {
pr_err("Can't find images parent node '%s' (%s)\n",
FIT_IMAGES_PATH, fdt_strerror(images_noffset));
return -ENODEV;
return -ENOENT;
}
for (ndepth = 0,

4
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_jimage.c
View File

@ -147,7 +147,7 @@ static int __mtdsplit_parse_jimage(struct mtd_info *master,
if (jimage_size == 0) {
pr_debug("no jImage found in \"%s\"\n", master->name);
ret = -ENODEV;
ret = -ENOENT;
goto err_free_buf;
}
@ -186,7 +186,7 @@ static int __mtdsplit_parse_jimage(struct mtd_info *master,
if (rootfs_size == 0) {
pr_debug("no rootfs found in \"%s\"\n", master->name);
ret = -ENODEV;
ret = -ENOENT;
goto err_free_buf;
}

6
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_mstc_boot.c
View File

@ -247,11 +247,7 @@ mtdsplit_mstcboot_parse(struct mtd_info *mtd,
ret = mstcboot_parse_image_parts(mtd, pparts);
exit:
/*
* return 0 when ret=-ENODEV, to prevent deletion of
* parent mtd partitions on Linux 6.7 and later
*/
return ret == -ENODEV ? 0 : ret;
return ret;
}
static const struct of_device_id mtdsplit_mstcboot_of_match_table[] = {

4
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_trx.c
View File

@ -100,7 +100,7 @@ mtdsplit_parse_trx(struct mtd_info *master,
if (trx_size == 0) {
pr_debug("no trx header found in \"%s\"\n", master->name);
ret = -ENODEV;
ret = -ENOENT;
goto err;
}
@ -111,7 +111,7 @@ mtdsplit_parse_trx(struct mtd_info *master,
if (rootfs_size == 0) {
pr_debug("no rootfs found in \"%s\"\n", master->name);
ret = -ENODEV;
ret = -ENOENT;
goto err;
}

2
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c
View File

@ -226,7 +226,7 @@ static int __mtdsplit_parse_uimage(struct mtd_info *master,
if (rootfs_size == 0) {
pr_debug("no rootfs found in \"%s\"\n", master->name);
ret = -ENODEV;
ret = -ENOENT;
goto err_free_buf;
}