bootm: Fix upper bound of FDT overlap checks
PATCH 1/1 bootm: Fix upper bound of FDT overlap checks
FTD blob can be put immediately after the OS image. So use strict inequality for start address check.
Fixes fbde7589ce30 ("common: bootm: add checks to verify if ramdisk / fdtimage overlaps OS image")
Signed-off-by Pali Rohár <[email protected]>
--- boot/bootm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
boot/bootm.c +2 -2
@@ -305,9 +305,9 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start,/* check if FDT overlaps OS image */ if (images.ft_addr && (((ulong )images.ft_addr >= start && - (ulong )images.ft_addr <= start + size) || + (ulong )images.ft_addr < start + size) || ((ulong )images.ft_addr + images.ft_len >= start && - (ulong )images.ft_addr + images.ft_len <= start + size))) { + (ulong )images.ft_addr + images.ft_len < start + size))) {printf ("ERROR: FDT image overlaps OS image (OS=0x%lx..0x%lx)\n" , start, start + size);return 1 ;
Signature · 1 line
2.20.1
Quoted 10 lines · Pali Rohár
FTD blob can be put immediately after the OS image. So use strict inequality for start address check.
Fixes fbde7589ce30 ("common: bootm: add checks to verify if ramdisk / fdtimage overlaps OS image")Signed-off-by Pali Rohár <[email protected]>--- boot/bootm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by Simon Glass <[email protected]>
Quoted 6 lines · Pali Rohár
FTD blob can be put immediately after the OS image. So use strict inequality for start address check.
Fixes fbde7589ce30 ("common: bootm: add checks to verify if ramdisk / fdtimage overlaps OS image")Signed-off-by Pali Rohár <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom