From 63e9a36056fe53621fa3001fe22b4833a9ea9457 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Mon, 12 Aug 2013 15:08:02 +0100 Subject: [PATCH] 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 [BZ #15855] * malloc/malloc.c (__libc_pvalloc): Check the value of bytes does not overflow. (cherry picked from commit 1159a193696ad48ec86e5895f6dee3e539619c0e) --- ChangeLog | 6 ++++++ malloc/malloc.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7fae731ba89..0c9e743a6b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-09-11 Will Newton + + [BZ #15855] + * malloc/malloc.c (__libc_pvalloc): Check the value of bytes + does not overflow. + 2013-08-16 Florian Weimer [BZ #14699] diff --git a/malloc/malloc.c b/malloc/malloc.c index be472b2ba38..bcc08c45f7b 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)) -- 2.47.2