OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

malloc: Add more integrity checks to mremap_chunk.

Browse Source 
* malloc/malloc.c (mremap_chunk): Additional checks.
This commit is contained in:
Istvan Kurucsai 2018-12-20 23:30:07 -05:00 committed by DJ Delorie
parent 5f72b00591
commit ebe544bf6e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2018-12-20 Istvan Kurucsai <pistukem@gmail.com>
* malloc/malloc.c (mremap_chunk): Additional checks.
2018-12-21 Mao Han <han_mao@c-sky.com>
* config.h.in (CSKYABI, CSKY_HARD_FLOAT): New Define.

12
malloc/malloc.c
View File

@ -2928,16 +2928,22 @@ mremap_chunk (mchunkptr p, size_t new_size)
char *cp;
assert (chunk_is_mmapped (p));
assert (((size + offset) & (GLRO (dl_pagesize) - 1)) == 0);
uintptr_t block = (uintptr_t) p - offset;
uintptr_t mem = (uintptr_t) chunk2mem(p);
size_t total_size = offset + size;
if (__glibc_unlikely ((block | total_size) & (pagesize - 1)) != 0
|| __glibc_unlikely (!powerof2 (mem & (pagesize - 1))))
malloc_printerr("mremap_chunk(): invalid pointer");
/* Note the extra SIZE_SZ overhead as in mmap_chunk(). */
new_size = ALIGN_UP (new_size + offset + SIZE_SZ, pagesize);
/* No need to remap if the number of pages does not change. */
if (size + offset == new_size)
if (total_size == new_size)
return p;
cp = (char *) __mremap ((char *) p - offset, size + offset, new_size,
cp = (char *) __mremap ((char *) block, total_size, new_size,
MREMAP_MAYMOVE);
if (cp == MAP_FAILED)