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.

(cherry picked from commit 55e17aadc1ef17a1df9626fb0e9fba290ece3331)

diff --git a/ChangeLog b/ChangeLog
index 0c9e743a6b3b8e80f075251ce50c1963e0177667..bf6d83790c6d2e30922aa54538b862d0378993b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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]

diff --git a/malloc/malloc.c b/malloc/malloc.c
index bcc08c45f7bf759933fa2ccf8a7fbce2be03d7be..31e2dfad91e1f766ea57f1681fd8db0109473163 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3046,6 +3046,13 @@ __libc_valloc(size_t bytes)
 
   size_t pagesz = GLRO(dl_pagesize);
 
+  /* 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))