Prevent crash if random/invalid ramdisks are passed to bootm
PATCH 1/1 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.
---
This is based on Anatolij's patch:
'Prevent crash if random DTB address is passed to bootm'
- k
common/cmd_bootm.c | 2 +- common/image.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
common/cmd_bootm.c +1 -1
@@ -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 ; }
common/image.c +2 -1
@@ -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 )
Signature · 1 line
1.5.5.1
Wolfgang Denk
AppliedPATCH 1/1 Prevent crash if random/invalid ramdisks are passed to bootm
Dear Kumar Gala,
Quoted 10 lines · In message <[email protected]> you…
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 <[email protected]>---
This is based on Anatolij's patch:
Quoted 7 lines
'Prevent crash if random DTB address is passed to bootm'
- k
common/cmd_bootm.c | 2 +- common/image.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de All this doesn't alter anything, you know. The world is still full of stupid people. They don't use their brains. They don't seem to want to think straight. - Terry Pratchett, _Soul Music_