Prevent crash if random/invalid ramdisks are passed to bootm

Adds returning an error from the ramdisk detection code if
its not a real ramdisk (invalid).  There is no reason we can't
just return back to the console if we detect an invalid
ramdisk or CRC error.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 374085ca38f24d7016c81ebadbae9c21be01f934..751f5b99d43b7a7db1e2d0499e2cefca5312b300 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -246,7 +246,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                ret = boot_get_ramdisk (argc, argv, &images, IH_INITRD_ARCH,
                                &images.rd_start, &images.rd_end);
                if (ret) {
-                       puts ("Ramdisk image is corrupt\n");
+                       puts ("Ramdisk image is corrupt or invalid\n");
                        return 1;
                }
 

diff --git a/common/image.c b/common/image.c
index 0acdcf132a6dcd4702e93a7cd5e918363877239b..94f01ad455d3d018770b13bb8345ab337dec5446 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -749,7 +749,7 @@ int genimg_has_config (bootm_headers_t *images)
  *     rd_start and rd_end are set to ramdisk start/end addresses if
  *     ramdisk image is found and valid
  *
- *     1, if ramdisk image is found but corrupted
+ *     1, if ramdisk image is found but corrupted, or invalid
  *     rd_start and rd_end are set to 0 if no ramdisk exists
  */
 int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
@@ -936,6 +936,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
                default:
                        puts ("Wrong Ramdisk Image Format\n");
                        rd_data = rd_len = rd_load = 0;
+                       return 1;
                }
 
 #if defined(CONFIG_B2) || defined(CONFIG_EVB4510) || defined(CONFIG_ARMADILLO)