[v2,BZ,#15857] malloc: Check for integer overflow in memalign.

Message ID 521327CE.2040705@linaro.org
State Superseded
Headers show

Commit Message

Will Newton Aug. 20, 2013, 8:24 a.m.
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-08-16  Will Newton  <will.newton@linaro.org>

	[BZ #15857]
	* malloc/malloc.c (__libc_memalign): Check the value of bytes
	does not overflow.
---
 malloc/malloc.c | 4 ++++
 1 file changed, 4 insertions(+)

Changes in v2:
 - Add BZ number

Comments

Will Newton Sept. 9, 2013, 8:26 a.m. | #1
On 20 August 2013 09:24, Will Newton <will.newton@linaro.org> wrote:
>
> 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-08-16  Will Newton  <will.newton@linaro.org>
>
>         [BZ #15857]
>         * malloc/malloc.c (__libc_memalign): Check the value of bytes
>         does not overflow.
> ---
>  malloc/malloc.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> Changes in v2:
>  - Add BZ number

Ping?

Patch

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 9aecc85..8c1aab8 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3015,6 +3015,10 @@  __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 + alignment + MINSIZE < bytes)
+    return 0;
+
   arena_get(ar_ptr, bytes + alignment + MINSIZE);
   if(!ar_ptr)
     return 0;