[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r25091 - in /branches/eglibc-2_16: ./ libc/ChangeLog libc/NEWS libc/malloc/malloc.c ports/sysdeps/arm/bits/predefs.h
- To: commits@xxxxxxxxxx
- Subject: [Commits] r25091 - in /branches/eglibc-2_16: ./ libc/ChangeLog libc/NEWS libc/malloc/malloc.c ports/sysdeps/arm/bits/predefs.h
- From: joseph@xxxxxxxxxx
- Date: Wed, 22 Jan 2014 03:32:02 -0000
Author: joseph
Date: Tue Jan 21 19:32:02 2014
New Revision: 25091
Log:
Merge changes between r23298 and r25090 from /fsf/glibc-2_16-branch.
Modified:
branches/eglibc-2_16/ (props changed)
branches/eglibc-2_16/libc/ChangeLog
branches/eglibc-2_16/libc/NEWS
branches/eglibc-2_16/libc/malloc/malloc.c
branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h (props changed)
Propchange: branches/eglibc-2_16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 21 19:32:02 2014
@@ -1,2 +1,2 @@
-/fsf/glibc-2_16-branch:19382-23298
+/fsf/glibc-2_16-branch:19382-25090
/fsf/trunk:15224-19381
Modified: branches/eglibc-2_16/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_16/libc/ChangeLog (original)
+++ branches/eglibc-2_16/libc/ChangeLog Tue Jan 21 19:32:02 2014
@@ -1,3 +1,10 @@
+2014-01-04 Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxx>
+ OndÃÂej BÃÂlka <neleai@xxxxxxxxx>
+
+ [BZ #15073]
+ * malloc/malloc.c (_int_free): Perform sanity check only if we
+ have_lock.
+
2012-11-20 Thomas Schwinge <thomas@xxxxxxxxxxxxxxxx>
* sysdeps/sh/dl-machine.h (ELF_MACHINE_RUNTIME_FIXUP_PARAMS): New
Modified: branches/eglibc-2_16/libc/NEWS
==============================================================================
--- branches/eglibc-2_16/libc/NEWS (original)
+++ branches/eglibc-2_16/libc/NEWS Tue Jan 21 19:32:02 2014
@@ -9,7 +9,7 @@
* The following bugs are resolved with this release:
- 6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831
+ 6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831, 15073
Version 2.16
Modified: branches/eglibc-2_16/libc/malloc/malloc.c
==============================================================================
--- branches/eglibc-2_16/libc/malloc/malloc.c (original)
+++ branches/eglibc-2_16/libc/malloc/malloc.c Tue Jan 21 19:32:02 2014
@@ -3868,25 +3868,29 @@
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);
-
- if (fd != NULL && __builtin_expect (old_idx != idx, 0))
+ while ((old = catomic_compare_and_exchange_val_rel (fb, p, old2)) != old2);
+
+ if (have_lock && old != NULL && __builtin_expect (old_idx != idx, 0))
{
errstr = "invalid fastbin entry (free)";
goto errout;
Propchange: branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 21 19:32:02 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-23298
+/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-25090
/fsf/trunk/ports/sysdeps/arm/bits/predefs.h:18166-19381
/fsf/trunk/ports/sysdeps/arm/eabi/bits/predefs.h:15224-17813
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits