Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull in upstream rev. 191413 to fix integer overflow in objalloc_alloc 

(CVE-2012-3509)
This commit is contained in:
drochner 2012-10-25 17:00:16 +00:00
parent 2900740595
commit d18545dea2
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/gpl3/binutils/dist/include/objalloc.h vendored
View File

@ -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 @@ extern void *_objalloc_alloc (struct objalloc *, unsigned long);
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)) \

11
external/gpl3/binutils/dist/libiberty/objalloc.c vendored
View File

@ -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, unsigned long len)
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;

4
external/gpl3/gcc/dist/include/objalloc.h vendored
View File

@ -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 @@ extern void *_objalloc_alloc (struct objalloc *, unsigned long);
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)) \

11
external/gpl3/gcc/dist/libiberty/objalloc.c vendored
View File

@ -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, unsigned long len)
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;