From 646148e747759f0af3b47f9bd287cedd7e174631 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Thu, 13 Sep 2018 17:58:50 +0200 Subject: [PATCH 50/72] Fix memory probing allocator to check for valid end address, too. --- src/lj_alloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lj_alloc.c b/src/lj_alloc.c index f3b6a54..33a2eb8 100644 --- a/src/lj_alloc.c +++ b/src/lj_alloc.c @@ -255,7 +255,8 @@ static void *mmap_probe(size_t size) for (retry = 0; retry < LJ_ALLOC_MMAP_PROBE_MAX; retry++) { void *p = mmap((void *)hint_addr, size, MMAP_PROT, MMAP_FLAGS_PROBE, -1, 0); uintptr_t addr = (uintptr_t)p; - if ((addr >> LJ_ALLOC_MBITS) == 0 && addr >= LJ_ALLOC_MMAP_PROBE_LOWER) { + if ((addr >> LJ_ALLOC_MBITS) == 0 && addr >= LJ_ALLOC_MMAP_PROBE_LOWER && + ((addr + size) >> LJ_ALLOC_MBITS) == 0) { /* We got a suitable address. Bump the hint address. */ hint_addr = addr + size; errno = olderr; -- 2.20.1