From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Falco Date: Sun, 22 Sep 2013 21:21:32 -0400 Subject: [U-Boot] [PATCH] Prevent a U-Boot crash on Wandboard Message-ID: <523F979C.1070205@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Prevent a crash when PXE boot calls do_bootm with a vmlinuz formatted image. In this case, there will be a null cmdtp pointer, and we must not dereference it. Signed-off-by: Steven A. Falco --- In file cmd_pxe.c around line 687 is a call: do_bootm(NULL, 0, bootm_argc, bootm_argv); Notice that the first argument is NULL. Therefore, the cmdtp pointer will always be NULL when using the pxe boot mechanism. do_bootm() eventually calls boot_get_kernel(), still with cmdtp == NULL. In the Wandboard case, the vmlinuz binary is not "legacy format", nor is it "fit format", so U-Boot attempts to print: printf("Wrong Image Format for %s command\n", cmdtp->name); That is doomed to fail, because cmdtp is NULL. The following patch corrects the problem; the command name will be printed only if the pointer is valid. diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 349f165..2249682 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -985,7 +985,10 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, break; #endif default: - printf("Wrong Image Format for %s command\n", cmdtp->name); + if (cmdtp) + printf("Wrong Image Format for %s command\n", cmdtp->name); + else + printf("Wrong Image Format for command\n"); bootstage_error(BOOTSTAGE_ID_FIT_KERNEL_INFO); return NULL; }