From: Keir Fraser Date: Wed, 27 Aug 2008 14:16:13 +0000 (+0100) Subject: hvmloader: Fix e820_malloc() after bug I introduced in c/s 18383 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14113^2~22 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f844c8910a076c195f79826a9a00bc5abc17519d;p=xen.git hvmloader: Fix e820_malloc() after bug I introduced in c/s 18383 Signed-off-by: Keir Fraser --- diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 1b2bdd9947..fe33b0f124 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -337,7 +337,7 @@ uint32_t e820_malloc(uint32_t size, uint32_t align) for ( i = *HVM_E820_NR - 1; i >= 0; i-- ) { - addr = (ent[i].size - size) & ~(align-1); + addr = (ent[i].addr + ent[i].size - size) & ~(align-1); if ( (ent[i].type != E820_RAM) || /* not ram? */ (addr < ent[i].addr) || /* too small or starts above 4gb? */ ((addr + size) < addr) ) /* ends above 4gb? */