浏览代码

spl: fix ext4fs_mount return code handling

- 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>
Thomas Schaefer 4 年之前
父节点
当前提交
ea5003ad66
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      common/spl/spl_ext.c

+ 1 - 1
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
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 		printf("%s: ext4fs mount err - %d\n", __func__, err);
 		printf("%s: ext4fs mount err - %d\n", __func__, err);
 #endif
 #endif
-		goto end;
+		return -1;
 	}
 	}
 
 
 	err = ext4fs_open(filename, &filelen);
 	err = ext4fs_open(filename, &filelen);