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