]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
spl: fix ext4fs_mount return code handling
authorThomas Schaefer <thomas.schaefer@kontron.com>
Tue, 16 Jun 2020 20:03:52 +0000 (22:03 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 17 Jul 2020 12:51:01 +0000 (08:51 -0400)
- 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@kontron.com>
[hthiery: slightly reword the commit message]
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
common/spl/spl_ext.c

index 3898041d106c926e85016bc69330b6dd7fba7745..d73f062762156819d08a7849ec5fa0dea98015da 100644 (file)
@@ -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);