diff options
| author | Florian Weimer <fweimer@redhat.com> | 2012-09-18 10:34:05 +0200 |
|---|---|---|
| committer | Florian Weimer <fw@gcc.gnu.org> | 2012-09-18 10:34:05 +0200 |
| commit | ed770de906725cde105e3b70fbfde825f713a689 (patch) | |
| tree | a72ef177002760bf83db64fa7e7131d153c945a0 /libiberty | |
| parent | 4d3999876e3c70b0d6bea7884b24953404055778 (diff) | |
| download | gcc-ed770de906725cde105e3b70fbfde825f713a689.zip gcc-ed770de906725cde105e3b70fbfde825f713a689.tar.gz gcc-ed770de906725cde105e3b70fbfde825f713a689.tar.bz2 | |
PR other/54411: integer overflow in objalloc_alloc
2012-09-18 Florian Weimer <fweimer@redhat.com>
PR other/54411
* objalloc.h (objalloc_alloc): Do not use fast path on wraparound.
2012-09-18 Florian Weimer <fweimer@redhat.com>
PR other/54411
* objalloc.c (_objalloc_alloc): Add overflow check covering
alignment and CHUNK_HEADER_SIZE addition.
From-SVN: r191413
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/objalloc.c | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 9afed43..9540b48 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2012-09-18 Florian Weimer <fweimer@redhat.com> + + PR other/54411 + * objalloc.c (_objalloc_alloc): Add overflow check covering + alignment and CHUNK_HEADER_SIZE addition. + 2011-08-28 H.J. Lu <hongjiu.lu@intel.com> * argv.c (dupargv): Replace malloc with xmalloc. Don't check diff --git a/libiberty/objalloc.c b/libiberty/objalloc.c index 3ddac2c..72e92d2 100644 --- a/libiberty/objalloc.c +++ b/libiberty/objalloc.c @@ -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; |