GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 17:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[new uImage] Return error on image move/uncompress overwrites

Browse source 
Check for overwrites during image move/uncompress, return with error
when the original image gets corrupted. Report clear message to the user
and prevent further troubles when pointer to the corrupted images is passed
to do_bootm_linux routine.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
This commit is contained in:
Marian Balakowicz 2008-01-31 13:20:06 +01:00 • committed by Wolfgang Denk
parent f13e7b2e99
commit 7582438c28
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/cmd_bootm.c
View file

@ -133,6 +133,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
ulong img_addr; ulong img_addr;
ulong os_data, os_len; ulong os_data, os_len;
ulong image_start, image_end;
ulong load_start, load_end;
if (argc < 2) { if (argc < 2) {
img_addr = load_addr; img_addr = load_addr;
} else { } else {
@ -234,6 +238,11 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
dcache_disable(); dcache_disable();
#endif #endif
image_start = (ulong)hdr;
image_end = image_get_image_end (hdr);
load_start = image_get_load (hdr);
load_end = 0;
switch (image_get_comp (hdr)) { switch (image_get_comp (hdr)) {
case IH_COMP_NONE: case IH_COMP_NONE:
if (image_get_load (hdr) == img_addr) { if (image_get_load (hdr) == img_addr) {
@ -244,6 +253,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
memmove_wd ((void *)image_get_load (hdr), memmove_wd ((void *)image_get_load (hdr),
(void *)os_data, os_len, CHUNKSZ); (void *)os_data, os_len, CHUNKSZ);
load_end = load_start + os_len;
puts("OK\n"); puts("OK\n");
} }
break; break;
@ -255,6 +265,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
show_boot_progress (-6); show_boot_progress (-6);
do_reset (cmdtp, flag, argc, argv); do_reset (cmdtp, flag, argc, argv);
} }
load_end = load_start + os_len;
break; break;
#ifdef CONFIG_BZIP2 #ifdef CONFIG_BZIP2
case IH_COMP_BZIP2: case IH_COMP_BZIP2:
@ -272,6 +284,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
show_boot_progress (-6); show_boot_progress (-6);
do_reset (cmdtp, flag, argc, argv); do_reset (cmdtp, flag, argc, argv);
} }
load_end = load_start + unc_len;
break; break;
#endif /* CONFIG_BZIP2 */ #endif /* CONFIG_BZIP2 */
default: default:
@ -284,6 +298,14 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
puts ("OK\n"); puts ("OK\n");
show_boot_progress (7); show_boot_progress (7);
if ((load_start < image_end) && (load_end > image_start)) {
debug ("image_start = 0x%lX, image_end = 0x%lx\n", image_start, image_end);
debug ("load_start = 0x%lx, load_end = 0x%lx\n", load_start, load_end);
puts ("ERROR: image overwritten - must RESET the board to recover.\n");
do_reset (cmdtp, flag, argc, argv);
}
switch (image_get_type (hdr)) { switch (image_get_type (hdr)) {
case IH_TYPE_STANDALONE: case IH_TYPE_STANDALONE:
if (iflag) if (iflag)

14
lib_ppc/ppc_linux.c
View file

@ -23,6 +23,8 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#define DEBUG
#include <common.h> #include <common.h>
#include <watchdog.h> #include <watchdog.h>
#include <command.h> #include <command.h>
@ -259,11 +261,19 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag,
of_data = (ulong)of_flat_tree; of_data = (ulong)of_flat_tree;
#endif #endif
} else if (image_check_magic (fdt_hdr)) { } else if (image_check_magic (fdt_hdr)) {
ulong image_start, image_end;
ulong load_start, load_end;
printf ("## Flat Device Tree at %08lX\n", fdt_hdr); printf ("## Flat Device Tree at %08lX\n", fdt_hdr);
print_image_hdr (fdt_hdr); print_image_hdr (fdt_hdr);
if ((image_get_load (fdt_hdr) < image_get_image_end (fdt_hdr)) && image_start = (ulong)fdt_hdr;
((image_get_load (fdt_hdr) + image_get_data_size (fdt_hdr)) > (unsigned long)fdt_hdr)) { image_end = image_get_image_end (fdt_hdr);
load_start = image_get_load (fdt_hdr);
load_end = load_start + image_get_data_size (fdt_hdr);
if ((load_start < image_end) && (load_end > image_start)) {
puts ("ERROR: fdt overwritten - " puts ("ERROR: fdt overwritten - "
"must RESET the board to recover.\n"); "must RESET the board to recover.\n");
do_reset (cmdtp, flag, argc, argv); do_reset (cmdtp, flag, argc, argv);