From 0047b6396c81ad5112f93e722566ef20df734ff9 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 6 Dec 2017 10:51:28 -0800 Subject: [PATCH] kernel - Fix ranging test in memory probe, adjust memory test (2) * Correct bug in ranging test commit. --- sys/platform/pc64/x86_64/machdep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c index 09d2279f24..ca6ef03550 100644 --- a/sys/platform/pc64/x86_64/machdep.c +++ b/sys/platform/pc64/x86_64/machdep.c @@ -2110,6 +2110,8 @@ getmemsize(caddr_t kmdp, u_int64_t first) */ if (pa >= 0x200000 && pa < first) { incr = first - pa; + if (pa + incr > end) + incr = end - pa; goto do_dump_avail; } @@ -2122,6 +2124,8 @@ getmemsize(caddr_t kmdp, u_int64_t first) incr = dcons_addr + dcons_size - pa; incr = (incr + PAGE_MASK) & ~(vm_paddr_t)PAGE_MASK; + if (pa + incr > end) + incr = end - pa; goto do_dump_avail; } -- 2.11.4.GIT