diff options
| author | Will Newton <will.newton@linaro.org> | 2013-08-16 11:59:37 +0100 |
|---|---|---|
| committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2015-01-15 15:00:41 -0500 |
| commit | f1292792799a507711ce24b497e40f8fea8f9c9c (patch) | |
| tree | a117a32de18ac6ae7b6e0056c803f314a9327917 | |
| parent | b1e934aed5170eb8948e0f3c6618c9431d6810ad (diff) | |
| download | glibc-f1292792799a507711ce24b497e40f8fea8f9c9c.tar.gz glibc-f1292792799a507711ce24b497e40f8fea8f9c9c.tar.xz glibc-f1292792799a507711ce24b497e40f8fea8f9c9c.zip | |
malloc: Check for integer overflow in valloc.
A large bytes parameter to valloc could cause an integer overflow and corrupt allocator internals. Check the overflow does not occur before continuing with the allocation. ChangeLog: 2013-09-11 Will Newton <will.newton@linaro.org> [BZ #15856] * malloc/malloc.c (__libc_valloc): Check the value of bytes does not overflow.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/malloc.c | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index edf1a9cc27..bd8deafc6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2013-09-11 Will Newton <will.newton@linaro.org> + [BZ #15856] + * malloc/malloc.c (__libc_valloc): Check the value of bytes + does not overflow. + +2013-09-11 Will Newton <will.newton@linaro.org> + [BZ #15855] * malloc/malloc.c (__libc_pvalloc): Check the value of bytes does not overflow. diff --git a/malloc/malloc.c b/malloc/malloc.c index ee89a67dbc..d5dacbf5bc 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3073,8 +3073,14 @@ __libc_valloc(size_t bytes) size_t pagesz = GLRO(dl_pagesize); - __malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, size_t, - const __malloc_ptr_t)) = + /* Check for overflow. */ + if (bytes > SIZE_MAX - pagesz - MINSIZE) + { + __set_errno (ENOMEM); + return 0; + } + + void *(*hook) (size_t, size_t, const void *) = force_reg (__memalign_hook); if (__builtin_expect (hook != NULL, 0)) return (*hook)(pagesz, bytes, RETURN_ADDRESS (0)); |