diff options
| author | Will Newton <will.newton@linaro.org> | 2013-08-16 12:54:29 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-10-25 23:53:32 +1000 |
| commit | dc7ba1835ba16cb49d6c38d50e153b70beb2a091 (patch) | |
| tree | 0324b3ad607c1682b548299e92cb87098258544e | |
| parent | 8f29d3b5ae201ae4af368d2221381c5a856913d5 (diff) | |
| download | glibc-dc7ba1835ba16cb49d6c38d50e153b70beb2a091.zip glibc-dc7ba1835ba16cb49d6c38d50e153b70beb2a091.tar.gz glibc-dc7ba1835ba16cb49d6c38d50e153b70beb2a091.tar.bz2 | |
malloc: Check for integer overflow in memalign.
A large bytes parameter to memalign 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 #15857]
* malloc/malloc.c (__libc_memalign): Check the value of bytes
does not overflow.
(cherry picked from commit b73ed247781d533628b681f57257dc85882645d3)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/malloc.c | 7 |
2 files changed, 13 insertions, 0 deletions
@@ -1,5 +1,11 @@ 2013-09-11 Will Newton <will.newton@linaro.org> + [BZ #15857] + * malloc/malloc.c (__libc_memalign): Check the value of bytes + does not overflow. + +2013-09-11 Will Newton <will.newton@linaro.org> + [BZ #15856] * malloc/malloc.c (__libc_valloc): Check the value of bytes does not overflow. diff --git a/malloc/malloc.c b/malloc/malloc.c index 31e2dfa..ebbe86d 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3015,6 +3015,13 @@ __libc_memalign(size_t alignment, size_t bytes) /* Otherwise, ensure that it is at least a minimum chunk size */ if (alignment < MINSIZE) alignment = MINSIZE; + /* Check for overflow. */ + if (bytes > SIZE_MAX - alignment - MINSIZE) + { + __set_errno (ENOMEM); + return 0; + } + arena_get(ar_ptr, bytes + alignment + MINSIZE); if(!ar_ptr) return 0; |