svn commit: r301977 - in stable/9/contrib/gcclibs: include libiberty

[Pedro F. Giffuni]

Author: pfg
Date: Fri Jun 17 02:31:18 2016
New Revision: 301977
URL: https://svnweb.freebsd.org/changeset/base/301977

Log:
  MFC r301291:
  libiberty: prevent integer overflow.
  
  Take care of very old bug leading to heap-buffer overflow by
  processing certain file headers via bfd binary.
  
  PR:		200888
  Obtained from:	OpenBSD

Modified:
  stable/9/contrib/gcclibs/include/objalloc.h
  stable/9/contrib/gcclibs/libiberty/objalloc.c
Directory Properties:
  stable/9/contrib/gcclibs/   (props changed)

Modified: stable/9/contrib/gcclibs/include/objalloc.h
==============================================================================
--- stable/9/contrib/gcclibs/include/objalloc.h	Fri Jun 17 02:29:55 2016	(r301976)
+++ stable/9/contrib/gcclibs/include/objalloc.h	Fri Jun 17 02:31:18 2016	(r301977)
@@ -1,5 +1,5 @@
 /* objalloc.h -- routines to allocate memory for objects
-   Copyright 1997, 2001 Free Software Foundation, Inc.
+   Copyright 1997, 2001-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 @@ extern void *_objalloc_alloc (struct obj
      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))				\

Modified: stable/9/contrib/gcclibs/libiberty/objalloc.c
==============================================================================
--- stable/9/contrib/gcclibs/libiberty/objalloc.c	Fri Jun 17 02:29:55 2016	(r301976)
+++ stable/9/contrib/gcclibs/libiberty/objalloc.c	Fri Jun 17 02:31:18 2016	(r301977)
@@ -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 @@ objalloc_create (void)
 /* 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 @@ _objalloc_alloc (struct objalloc *o, uns
 
   len = (len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);
 
+  /* CVE-2012-3509: Check for overflow in the alignment operation above
+   * and then malloc argument below. */
+  if (len + CHUNK_HEADER_SIZE < original_len)
+      return NULL;
+
   if (len <= o->current_space)
     {
       o->current_ptr += len;