[Commits] r25092 - in /branches/eglibc-2_15: ./ libc/ChangeLog libc/NEWS libc/malloc/malloc.c

[joseph@xxxxxxxxxx]

Author: joseph
Date: Tue Jan 21 19:33:22 2014
New Revision: 25092

Log:
Merge changes between r24307 and r25091 from /fsf/glibc-2_15-branch.

Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/libc/ChangeLog
    branches/eglibc-2_15/libc/NEWS
    branches/eglibc-2_15/libc/malloc/malloc.c

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 21 19:33:22 2014
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-24307
+/fsf/glibc-2_15-branch:16509-25091
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_15/libc/ChangeLog (original)
+++ branches/eglibc-2_15/libc/ChangeLog Tue Jan 21 19:33:22 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: branches/eglibc-2_15/libc/NEWS
==============================================================================
--- branches/eglibc-2_15/libc/NEWS (original)
+++ branches/eglibc-2_15/libc/NEWS Tue Jan 21 19:33:22 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: branches/eglibc-2_15/libc/malloc/malloc.c
==============================================================================
--- branches/eglibc-2_15/libc/malloc/malloc.c (original)
+++ branches/eglibc-2_15/libc/malloc/malloc.c Tue Jan 21 19:33:22 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