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 1159a193696ad48ec86e5895f6dee3e539619c0e)

diff --git a/ChangeLog b/ChangeLog
index 7fae731ba8901e34c1f56a1aecbc1ee7ce5a8ef3..0c9e743a6b3b8e80f075251ce50c1963e0177667 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-11  Will Newton  <will.newton@linaro.org>
+
+       [BZ #15855]
+       * malloc/malloc.c (__libc_pvalloc): Check the value of bytes
+       does not overflow.
+
 2013-08-16  Florian Weimer  <fweimer@redhat.com>
 
        [BZ #14699]

diff --git a/malloc/malloc.c b/malloc/malloc.c
index be472b2ba3885b194f55c29474c4ad5d6a61b729..bcc08c45f7bf759933fa2ccf8a7fbce2be03d7be 100644 (file)
--- 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))