[U-Boot] [PATCH 02/21] sandbox: Check the filename in jump_to_image_no_args()

Simon Glass sjg at chromium.org
Sat Nov 24 04:29:25 UTC 2018


If the filename is NULL this function currently crashes. Update it to fail
gracefully.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/sandbox/cpu/spl.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 5005ed2f54a..2ca4cd6e35e 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -69,7 +69,11 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 {
 	const char *fname = spl_image->arg;
 
-	os_fd_restore();
-	os_spl_to_uboot(fname);
+	if (fname) {
+		os_fd_restore();
+		os_spl_to_uboot(fname);
+	} else {
+		printf("No filename provided for U-Boot\n");
+	}
 	hang();
 }
-- 
2.20.0.rc0.387.gc7a69e6b6c-goog



More information about the U-Boot mailing list