[src/trunk]: src/external/gpl3 pull in upstream rev. 191413 to fix integer ov...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b44928d0cbea
branches:  trunk
changeset: 782280:b44928d0cbea
user:      drochner <drochner%NetBSD.org@localhost>
date:      Thu Oct 25 17:00:16 2012 +0000

description:
pull in upstream rev. 191413 to fix integer overflow in objalloc_alloc
(CVE-2012-3509)

diffstat:

 external/gpl3/binutils/dist/include/objalloc.h   |   4 ++--
 external/gpl3/binutils/dist/libiberty/objalloc.c |  11 +++++++++--
 external/gpl3/gcc/dist/include/objalloc.h        |   4 ++--
 external/gpl3/gcc/dist/libiberty/objalloc.c      |  11 +++++++++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diffs (106 lines):

diff -r 003f146ca5f0 -r b44928d0cbea external/gpl3/binutils/dist/include/objalloc.h
--- a/external/gpl3/binutils/dist/include/objalloc.h    Thu Oct 25 15:14:36 2012 +0000
+++ b/external/gpl3/binutils/dist/include/objalloc.h    Thu Oct 25 17:00:16 2012 +0000
@@ -1,5 +1,5 @@
 /* objalloc.h -- routines to allocate memory for objects
-   Copyright 1997, 2001 Free Software Foundation, Inc.
+   Copyright 1997-2012 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Solutions.
 
 This program is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@
      if (__len == 0)                                                   \
        __len = 1;                                                      \
      __len = (__len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);     \
-     (__len <= __o->current_space                                      \
+     (__len != 0 && __len <= __o->current_space                                \
       ? (__o->current_ptr += __len,                                    \
         __o->current_space -= __len,                                   \
         (void *) (__o->current_ptr - __len))                           \
diff -r 003f146ca5f0 -r b44928d0cbea external/gpl3/binutils/dist/libiberty/objalloc.c
--- a/external/gpl3/binutils/dist/libiberty/objalloc.c  Thu Oct 25 15:14:36 2012 +0000
+++ b/external/gpl3/binutils/dist/libiberty/objalloc.c  Thu Oct 25 17:00:16 2012 +0000
@@ -1,5 +1,5 @@
 /* objalloc.c -- routines to allocate memory for objects
-   Copyright 1997 Free Software Foundation, Inc.
+   Copyright 1997-2012 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Solutions.
 
 This program is free software; you can redistribute it and/or modify it
@@ -112,8 +112,10 @@
 /* Allocate space from an objalloc structure.  */
 
 PTR
-_objalloc_alloc (struct objalloc *o, unsigned long len)
+_objalloc_alloc (struct objalloc *o, unsigned long original_len)
 {
+  unsigned long len = original_len;
+
   /* We avoid confusion from zero sized objects by always allocating
      at least 1 byte.  */
   if (len == 0)
@@ -121,6 +123,11 @@
 
   len = (len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);
 
+  /* Check for overflow in the alignment operation above and the
+     malloc argument below. */
+  if (len + CHUNK_HEADER_SIZE < original_len)
+    return NULL;
+
   if (len <= o->current_space)
     {
       o->current_ptr += len;
diff -r 003f146ca5f0 -r b44928d0cbea external/gpl3/gcc/dist/include/objalloc.h
--- a/external/gpl3/gcc/dist/include/objalloc.h Thu Oct 25 15:14:36 2012 +0000
+++ b/external/gpl3/gcc/dist/include/objalloc.h Thu Oct 25 17:00:16 2012 +0000
@@ -1,5 +1,5 @@
 /* objalloc.h -- routines to allocate memory for objects
-   Copyright 1997, 2001 Free Software Foundation, Inc.
+   Copyright 1997-2012 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Solutions.
 
 This program is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@
      if (__len == 0)                                                   \
        __len = 1;                                                      \
      __len = (__len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);     \
-     (__len <= __o->current_space                                      \
+     (__len != 0 && __len <= __o->current_space                                \
       ? (__o->current_ptr += __len,                                    \
         __o->current_space -= __len,                                   \
         (void *) (__o->current_ptr - __len))                           \
diff -r 003f146ca5f0 -r b44928d0cbea external/gpl3/gcc/dist/libiberty/objalloc.c
--- a/external/gpl3/gcc/dist/libiberty/objalloc.c       Thu Oct 25 15:14:36 2012 +0000
+++ b/external/gpl3/gcc/dist/libiberty/objalloc.c       Thu Oct 25 17:00:16 2012 +0000
@@ -1,5 +1,5 @@
 /* objalloc.c -- routines to allocate memory for objects
-   Copyright 1997 Free Software Foundation, Inc.
+   Copyright 1997-2012 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Solutions.
 
 This program is free software; you can redistribute it and/or modify it
@@ -112,8 +112,10 @@
 /* Allocate space from an objalloc structure.  */
 
 PTR
-_objalloc_alloc (struct objalloc *o, unsigned long len)
+_objalloc_alloc (struct objalloc *o, unsigned long original_len)
 {
+  unsigned long len = original_len;
+
   /* We avoid confusion from zero sized objects by always allocating
      at least 1 byte.  */
   if (len == 0)
@@ -121,6 +123,11 @@
 
   len = (len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);
 
+  /* Check for overflow in the alignment operation above and the
+     malloc argument below. */
+  if (len + CHUNK_HEADER_SIZE < original_len)
+    return NULL;
+
   if (len <= o->current_space)
     {
       o->current_ptr += len;