diff options
| author | Istvan Kurucsai <pistukem@gmail.com> | 2018-12-21 00:13:01 -0500 |
|---|---|---|
| committer | Arjun Shankar <arjun@redhat.com> | 2019-05-02 14:28:59 +0200 |
| commit | 38e89818335400b5593943f92a379b9c669b758c (patch) | |
| tree | 74097e3242b7c25ee481d10043157aba8e805818 /malloc/malloc.c | |
| parent | b9054d660202ea4ae5fd4331a7eee1a0eff1817a (diff) | |
| download | glibc-38e89818335400b5593943f92a379b9c669b758c.tar glibc-38e89818335400b5593943f92a379b9c669b758c.tar.gz glibc-38e89818335400b5593943f92a379b9c669b758c.tar.bz2 glibc-38e89818335400b5593943f92a379b9c669b758c.zip | |
malloc: Check the alignment of mmapped chunks before unmapping.
* malloc/malloc.c (munmap_chunk): Verify chunk alignment.
(cherry picked from commit c0e82f117357a941e4d40fcc08babbd6a3c3a1b5)
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 7880fcd1c3..6ae22e61dc 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2810,6 +2810,7 @@ systrim (size_t pad, mstate av) static void munmap_chunk (mchunkptr p) { + size_t pagesize = GLRO (dl_pagesize); INTERNAL_SIZE_T size = chunksize (p); assert (chunk_is_mmapped (p)); @@ -2819,6 +2820,7 @@ munmap_chunk (mchunkptr p) if (DUMPED_MAIN_ARENA_CHUNK (p)) return; + uintptr_t mem = (uintptr_t) chunk2mem (p); uintptr_t block = (uintptr_t) p - prev_size (p); size_t total_size = prev_size (p) + size; /* Unfortunately we have to do the compilers job by hand here. Normally @@ -2826,7 +2828,8 @@ munmap_chunk (mchunkptr p) page size. But gcc does not recognize the optimization possibility (in the moment at least) so we combine the two values into one before the bit test. */ - if (__builtin_expect (((block | total_size) & (GLRO (dl_pagesize) - 1)) != 0, 0)) + if (__glibc_unlikely ((block | total_size) & (pagesize - 1)) != 0 + || __glibc_unlikely (!powerof2 (mem & (pagesize - 1)))) malloc_printerr ("munmap_chunk(): invalid pointer"); atomic_decrement (&mp_.n_mmaps); |