diff options
| author | Will Newton <will.newton@linaro.org> | 2013-08-12 15:08:02 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-06 08:42:30 -0500 |
| commit | 7e52cc7af467b6a8ba6367af4fecd4c3289db454 (patch) | |
| tree | 72b89b7bad1db27e567b93991678b11f2ea382ba | |
| parent | 4e3c791909a092489659d4359b73474febbd484a (diff) | |
| download | glibc-7e52cc7af467b6a8ba6367af4fecd4c3289db454.zip glibc-7e52cc7af467b6a8ba6367af4fecd4c3289db454.tar.gz glibc-7e52cc7af467b6a8ba6367af4fecd4c3289db454.tar.bz2 | |
malloc: Check for integer overflow in pvalloc.
A large bytes parameter to pvalloc 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 #15855]
* malloc/malloc.c (__libc_pvalloc): Check the value of bytes
does not overflow.
(cherry picked from commit 7e0e64ead52591b968df582b0ddc247ba5c4eab4)
| -rw-r--r-- | malloc/malloc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index be472b2..bcc08c4 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3082,6 +3082,13 @@ __libc_pvalloc(size_t bytes) size_t page_mask = GLRO(dl_pagesize) - 1; size_t rounded_bytes = (bytes + page_mask) & ~(page_mask); + /* Check for overflow. */ + if (bytes > SIZE_MAX - 2*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)) |