[PATCH v2 1/1] spl: fix ext4fs_mount return code handling
Heiko Thiery
heiko.thiery at gmail.com
Tue Jun 16 22:03:52 CEST 2020
From: Thomas Schaefer <thomas.schaefer at kontron.com>
- Despite other ext4 filesystem functions, ext4fs_mount returns
0 in case of error.
- This leads to u-boot crash in case that an SD card
with valid partition table but without ext4 filesystem created
in a partition is found on SD card.
- Fix this by returning a proper error code of '-1' from spl_load_image_ext
function in case of ext4fs_mount error.
Signed-off-by: Thomas Schaefer <thomas.schaefer at kontron.com>
[hthiery: slightly reword the commit message]
Signed-off-by: Heiko Thiery <heiko.thiery at gmail.com>
Reviewed-by: Tom Rini <trini at konsulko.com>
---
v1 -> v2:
- directly return -1 instead of goto end (Tom Rini).
---
common/spl/spl_ext.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index 3898041d10..d73f062762 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -32,7 +32,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image,
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
printf("%s: ext4fs mount err - %d\n", __func__, err);
#endif
- goto end;
+ return -1;
}
err = ext4fs_open(filename, &filelen);
--
2.20.1
More information about the U-Boot
mailing list