diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-22 03:33:22 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-22 03:33:22 +0000 |
| commit | baef8ab2ac4daea246a54919204f138ad57cac53 (patch) | |
| tree | 4b9b36c866328cb84efef189bd89aa5d9156e6fe | |
| parent | 049de96079def0905a244c6991005b47ae5cb1f6 (diff) | |
Merge changes between r24307 and r25091 from /fsf/glibc-2_15-branch.
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_15@25092 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog | 7 | ||||
| -rw-r--r-- | libc/NEWS | 2 | ||||
| -rw-r--r-- | libc/malloc/malloc.c | 20 |
3 files changed, 20 insertions, 9 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index dd64c0523..92b313878 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,10 @@ +2014-01-04 Maxim Kuvyrkov <maxim@kugelworks.com> + Ondřej Bílka <neleai@seznam.cz> + + [BZ #15073] + * malloc/malloc.c (_int_free): Perform sanity check only if we + have_lock. + 2012-01-28 Chris Metcalf <cmetcalf@tilera.com> * sysdeps/unix/sysv/linux/faccessat.c (faccessat): Call __fxstatat64. @@ -11,7 +11,7 @@ Version 2.15.1 411, 2547, 2548, 11261, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748, 13749, 13753, 13754, 13771, 13773, 13774, 13786, 14048, 14059, - 14167, 14273, 14459, 14621, 14648, 14040 + 14167, 14273, 14459, 14621, 14648, 14040, 15073 Version 2.15 diff --git a/libc/malloc/malloc.c b/libc/malloc/malloc.c index 8608083ad..aeda31d27 100644 --- a/libc/malloc/malloc.c +++ b/libc/malloc/malloc.c @@ -3989,25 +3989,29 @@ _int_free(mstate av, mchunkptr p, int have_lock) unsigned int idx = fastbin_index(size); fb = &fastbin (av, idx); - mchunkptr fd; - mchunkptr old = *fb; + /* Atomically link P to its fastbin: P->FD = *FB; *FB = P; */ + mchunkptr old = *fb, old2; unsigned int old_idx = ~0u; do { - /* Another simple check: make sure the top of the bin is not the - record we are going to add (i.e., double free). */ + /* Check that the top of the bin is not the record we are going to add + (i.e., double free). */ if (__builtin_expect (old == p, 0)) { errstr = "double free or corruption (fasttop)"; goto errout; } - if (old != NULL) + /* Check that size of fastbin chunk at the top is the same as + size of the chunk that we are adding. We can dereference OLD + only if we have the lock, otherwise it might have already been + deallocated. See use of OLD_IDX below for the actual check. */ + if (have_lock && old != NULL) old_idx = fastbin_index(chunksize(old)); - p->fd = fd = old; + p->fd = old2 = old; } - while ((old = catomic_compare_and_exchange_val_rel (fb, p, fd)) != fd); + while ((old = catomic_compare_and_exchange_val_rel (fb, p, old2)) != old2); - if (fd != NULL && __builtin_expect (old_idx != idx, 0)) + if (have_lock && old != NULL && __builtin_expect (old_idx != idx, 0)) { errstr = "invalid fastbin entry (free)"; goto errout; |