From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Date: Wed, 6 Sep 2023 12:25:11 +0000 (+0200)
Subject: spl: undefined return value in spl_blk_load_image
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=323e91a1832b7f10e8966b2fd43b71cf27abefa7;p=u-boot.git

spl: undefined return value in spl_blk_load_image

spl_blk_load_image() should not return an uninitialized value if
blk_get_devnum_by_uclass_id() fails.

Fixes: 8ce6a2e17577 ("spl: blk: Support loading images from fs")
Reported-by: Xavier Drudis Ferran <xdrudis@tinet.cat>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by:  Xavier Drudis Ferran <xdrudis@tinet.cat>
---

diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c
index eb6f526689..ea5d1a51d9 100644
--- a/common/spl/spl_blk_fs.c
+++ b/common/spl/spl_blk_fs.c
@@ -53,7 +53,7 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
 	blk_desc = blk_get_devnum_by_uclass_id(uclass_id, devnum);
 	if (!blk_desc) {
 		printf("blk desc for %d %d not found\n", uclass_id, devnum);
-		goto out;
+		return -ENODEV;
 	}
 
 	blk_show_device(uclass_id, devnum);