From: Will Newton <will.newton@linaro.org>
Date: Fri, 16 Aug 2013 11:54:29 +0000 (+0100)
Subject: malloc: Check for integer overflow in memalign.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc7ba1835ba16cb49d6c38d50e153b70beb2a091;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index bf6d83790c6..fbfae9af3bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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]
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 31e2dfad91e..ebbe86dc7c3 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;