[2/7] malloc/malloc.c: Check for integer overflow in valloc.

Message ID 52127626.6050203@linaro.org
State Superseded
Headers show

Commit Message

Will Newton Aug. 19, 2013, 7:46 p.m.
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-08-16  Will Newton  <will.newton@linaro.org>

    * malloc/malloc.c (__libc_valloc): Check the value of bytes
    does not overflow.
---
 malloc/malloc.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 7468758..9aecc85 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3046,6 +3046,10 @@  __libc_valloc(size_t bytes)

   size_t pagesz = GLRO(dl_pagesize);

+  /* Check for overflow.  */
+  if (bytes + pagesz + MINSIZE < bytes)
+    return 0;
+
   void *(*hook) (size_t, size_t, const void *) =
     force_reg (__memalign_hook);
   if (__builtin_expect (hook != NULL, 0))