From c6b8b7dcc4cc1c3e4b142d3b5d460b1550ea8a73 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 7 Nov 2011 12:56:12 -0800 Subject: selfboot: fix bug in valid_area() valid_area will accept a region as valid for the payload if only a part of coreboot fits in that region. This means if a payload reaches into a neighboring RESERVED region, coreboot would not care and happily overwrite that region, as long as the payload also writes to some RAM. Change-Id: Ie263f83be18009b01a31c71e7285c998747d097f Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/425 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/boot/selfboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/boot') diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c index 573dd5ee5a..ab0bf21c67 100644 --- a/src/boot/selfboot.c +++ b/src/boot/selfboot.c @@ -140,10 +140,10 @@ static int valid_area(struct lb_memory *mem, unsigned long buffer, mtype = mem->map[i].type; mstart = unpack_lb64(mem->map[i].start); mend = mstart + unpack_lb64(mem->map[i].size); - if ((mtype == LB_MEM_RAM) && (start < mend) && (end > mstart)) { + if ((mtype == LB_MEM_RAM) && (start >= mstart) && (end < mend)) { break; } - if ((mtype == LB_MEM_TABLE) && (start < mend) && (end > mstart)) { + if ((mtype == LB_MEM_TABLE) && (start >= mstart) && (end < mend)) { printk(BIOS_ERR, "Payload is overwriting coreboot tables.\n"); break; } -- cgit v1.2.3