From: Anatolij Gustschin <agust@denx.de>
Date: Fri, 29 Aug 2008 19:04:45 +0000 (+0200)
Subject: Prevent crash if random DTB address is passed to bootm
X-Git-Tag: v2008.10-rc1~49
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=8e02494e8f86c8f2d7324b5eb9e75271104a01ef;p=karo-tx-uboot.git

Prevent crash if random DTB address is passed to bootm

This patch adds bootm_start() return value check. If
error status is returned, we do not proceed further to
prevent board reset or crash as we still can recover
at this point.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 0db7b75bac..374085ca38 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -361,7 +361,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	ulong		load_end = 0;
 	int		ret;
 
-	bootm_start(cmdtp, flag, argc, argv);
+	if (bootm_start(cmdtp, flag, argc, argv))
+		return 1;
 
 	/*
 	 * We have reached the point of no return: we are going to
diff --git a/common/image.c b/common/image.c
index 55c4ccec8b..0acdcf132a 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1516,7 +1516,7 @@ int boot_get_fdt (int flag, int argc, char *argv[], bootm_headers_t *images,
 			}
 			break;
 		default:
-			fdt_error ("Did not find a cmdline Flattened Device Tree");
+			puts ("ERROR: Did not find a cmdline Flattened Device Tree\n");
 			goto error;
 		}