[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r24958 - in /fsf/glibc-2_15-branch/libc: ChangeLog NEWS malloc/malloc.c
- To: commits@xxxxxxxxxx
- Subject: [Commits] r24958 - in /fsf/glibc-2_15-branch/libc: ChangeLog NEWS malloc/malloc.c
- From: eglibc@xxxxxxxxxx
- Date: Sun, 05 Jan 2014 08:10:43 -0000
Author: eglibc
Date: Sun Jan 5 00:10:42 2014
New Revision: 24958
Log:
Import glibc-2.15 for 2014-01-05
Modified:
fsf/glibc-2_15-branch/libc/ChangeLog
fsf/glibc-2_15-branch/libc/NEWS
fsf/glibc-2_15-branch/libc/malloc/malloc.c
Modified: fsf/glibc-2_15-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_15-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_15-branch/libc/ChangeLog Sun Jan 5 00:10:42 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-01-28 Chris Metcalf <cmetcalf@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/faccessat.c (faccessat): Call __fxstatat64.
Modified: fsf/glibc-2_15-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_15-branch/libc/NEWS (original)
+++ fsf/glibc-2_15-branch/libc/NEWS Sun Jan 5 00:10:42 2014
@@ -11,7 +11,7 @@
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
Modified: fsf/glibc-2_15-branch/libc/malloc/malloc.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/malloc/malloc.c (original)
+++ fsf/glibc-2_15-branch/libc/malloc/malloc.c Sun Jan 5 00:10:42 2014
@@ -3989,25 +3989,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;
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits