[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r25089 - in /branches/eglibc-2_18: ./ libc/ libc/malloc/ libc/ports/ libc/ports/sysdeps/aarch64/ libc/ports/sysdeps/aarch64/...

To: commits@xxxxxxxxxx
Subject: [Commits] r25089 - in /branches/eglibc-2_18: ./ libc/ libc/malloc/ libc/ports/ libc/ports/sysdeps/aarch64/ libc/ports/sysdeps/aarch64/...
From: joseph@xxxxxxxxxx
Date: Wed, 22 Jan 2014 03:29:10 -0000

Author: joseph
Date: Tue Jan 21 19:29:09 2014
New Revision: 25089

Log:
Merge changes between r24942 and r25088 from /fsf/glibc-2_18-branch.

Modified:
    branches/eglibc-2_18/   (props changed)
    branches/eglibc-2_18/libc/ChangeLog
    branches/eglibc-2_18/libc/NEWS
    branches/eglibc-2_18/libc/malloc/malloc.c
    branches/eglibc-2_18/libc/ports/ChangeLog.aarch64
    branches/eglibc-2_18/libc/ports/sysdeps/aarch64/dl-trampoline.S
    branches/eglibc-2_18/libc/ports/sysdeps/aarch64/fpu/fpu_control.h
    branches/eglibc-2_18/libc/ports/sysdeps/aarch64/soft-fp/sfp-machine.h
    branches/eglibc-2_18/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data   (props changed)
    branches/eglibc-2_18/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data   (props changed)
    branches/eglibc-2_18/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data   (props changed)
    branches/eglibc-2_18/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data   (props changed)
    branches/eglibc-2_18/libc/sysdeps/x86_64/x32/symbol-hacks.h

Propchange: branches/eglibc-2_18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 21 19:29:09 2014
@@ -1,2 +1,2 @@
-/fsf/glibc-2_18-branch:23787-24942
+/fsf/glibc-2_18-branch:23787-25088
 /fsf/trunk:15224-23715

Modified: branches/eglibc-2_18/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_18/libc/ChangeLog (original)
+++ branches/eglibc-2_18/libc/ChangeLog Tue Jan 21 19:29:09 2014
@@ -1,3 +1,15 @@
+2014-01-20  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #15605]
+	* sysdeps/x86_64/x32/symbol-hacks.h: Include generic symbol-hacks.h.
+
+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.
+
 2013-11-11  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	[BZ #16150]

Modified: branches/eglibc-2_18/libc/NEWS
==============================================================================
--- branches/eglibc-2_18/libc/NEWS (original)
+++ branches/eglibc-2_18/libc/NEWS Tue Jan 21 19:29:09 2014
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  15128, 15909, 15996, 16150.
+  15073, 15128, 15909, 15996, 16150, 16387.
 
 Version 2.18
 

Modified: branches/eglibc-2_18/libc/malloc/malloc.c
==============================================================================
--- branches/eglibc-2_18/libc/malloc/malloc.c (original)
+++ branches/eglibc-2_18/libc/malloc/malloc.c Tue Jan 21 19:29:09 2014
@@ -3809,25 +3809,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;

Modified: branches/eglibc-2_18/libc/ports/ChangeLog.aarch64
==============================================================================
--- branches/eglibc-2_18/libc/ports/ChangeLog.aarch64 (original)
+++ branches/eglibc-2_18/libc/ports/ChangeLog.aarch64 Tue Jan 21 19:29:09 2014
@@ -1,3 +1,15 @@
+2014-01-07  Marcus Shawcroft  <marcus.shawcroft@xxxxxxxxxx>
+
+	[BZ #16387]
+	* sysdeps/aarch64/fpu/fpu_control.h (_FPU_FPCR_RM_MASK): Define.
+	* sysdeps/aarch64/soft-fp/sfp-machine.h (FP_ROUNDMODE): Adjust
+	rounding mode mask.
+
+2014-01-07  Marcus Shawcroft  <marcus.shawcroft@xxxxxxxxxx>
+
+	* sysdeps/aarch64/dl-trampoline.S (_dl_runtime_resolve): Correct
+	cfi_adjust_cfa_offset offset.
+
 2013-12-18  Marcus Shawcroft  <marcus.shawcroft@xxxxxxxxxx>
 
 	[BZ #15128]

Modified: branches/eglibc-2_18/libc/ports/sysdeps/aarch64/dl-trampoline.S
==============================================================================
--- branches/eglibc-2_18/libc/ports/sysdeps/aarch64/dl-trampoline.S (original)
+++ branches/eglibc-2_18/libc/ports/sysdeps/aarch64/dl-trampoline.S Tue Jan 21 19:29:09 2014
@@ -42,7 +42,7 @@
 
 	/* Save arguments.  */
 	stp	x8, x9, [sp, #-(80+8*16)]!
-	cfi_adjust_cfa_offset (80)
+	cfi_adjust_cfa_offset (80+8*16)
 	cfi_rel_offset (x8, 0)
 	cfi_rel_offset (x9, 8)
 

Modified: branches/eglibc-2_18/libc/ports/sysdeps/aarch64/fpu/fpu_control.h
==============================================================================
--- branches/eglibc-2_18/libc/ports/sysdeps/aarch64/fpu/fpu_control.h (original)
+++ branches/eglibc-2_18/libc/ports/sysdeps/aarch64/fpu/fpu_control.h Tue Jan 21 19:29:09 2014
@@ -59,6 +59,9 @@
                    E E D D
                        E E
  */
+
+#define _FPU_FPCR_RM_MASK  0xc00000
+
 #define _FPU_FPCR_MASK_IXE 0x1000
 #define _FPU_FPCR_MASK_UFE 0x0800
 #define _FPU_FPCR_MASK_OFE 0x0400

Modified: branches/eglibc-2_18/libc/ports/sysdeps/aarch64/soft-fp/sfp-machine.h
==============================================================================
--- branches/eglibc-2_18/libc/ports/sysdeps/aarch64/soft-fp/sfp-machine.h (original)
+++ branches/eglibc-2_18/libc/ports/sysdeps/aarch64/soft-fp/sfp-machine.h Tue Jan 21 19:29:09 2014
@@ -47,7 +47,7 @@
 
 #define _FP_DECL_EX		fpu_control_t _fcw
 
-#define FP_ROUNDMODE		(_fcw & 0x3)
+#define FP_ROUNDMODE		(_fcw & _FPU_FPCR_RM_MASK)
 
 #define FP_RND_NEAREST		FE_TONEAREST
 #define FP_RND_ZERO		FE_TOWARDZERO

Propchange: branches/eglibc-2_18/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 21 19:29:09 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_18-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:23787-24942
+/fsf/glibc-2_18-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:23787-25088
 /fsf/trunk/libc/ports/data/c++-types-powerpce500v2-linux-gnu.data:15224-19464
 /fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-23715

Propchange: branches/eglibc-2_18/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 21 19:29:09 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_18-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:23787-24942
+/fsf/glibc-2_18-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:23787-25088
 /fsf/trunk/libc/ports/data/localplt-powerpce500v2-linux-gnu.data:15224-19464
 /fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-23715

Propchange: branches/eglibc-2_18/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 21 19:29:09 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_18-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:23787-24942
+/fsf/glibc-2_18-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:23787-25088
 /fsf/trunk/libc/ports/data/c++-types-powerpce500v1-linux-gnu.data:15224-19464
 /fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-23715

Propchange: branches/eglibc-2_18/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 21 19:29:09 2014
@@ -1,3 +1,3 @@
-/fsf/glibc-2_18-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:23787-24942
+/fsf/glibc-2_18-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:23787-25088
 /fsf/trunk/libc/ports/data/localplt-powerpce500v1-linux-gnu.data:15224-19464
 /fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-23715

Modified: branches/eglibc-2_18/libc/sysdeps/x86_64/x32/symbol-hacks.h
==============================================================================
--- branches/eglibc-2_18/libc/sysdeps/x86_64/x32/symbol-hacks.h (original)
+++ branches/eglibc-2_18/libc/sysdeps/x86_64/x32/symbol-hacks.h Tue Jan 21 19:29:09 2014
@@ -1,1 +1,1 @@
-/* Fortunately nothing to do.  */
+#include <sysdeps/generic/symbol-hacks.h>

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits

Prev by Date: [Commits] r25088 - in /trunk: ./ libc/ libc/benchtests/ libc/elf/ libc/inet/netinet/ libc/malloc/ libc/math/ libc/nptl/ libc/nptl/sysd...
Next by Date: [Commits] r25090 - in /branches/eglibc-2_17: ./ libc/ libc/malloc/ libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/ lib...
Previous by thread: [Commits] r25088 - in /trunk: ./ libc/ libc/benchtests/ libc/elf/ libc/inet/netinet/ libc/malloc/ libc/math/ libc/nptl/ libc/nptl/sysd...
Next by thread: [Commits] r25090 - in /branches/eglibc-2_17: ./ libc/ libc/malloc/ libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/ lib...
Index(es):
- Date
- Thread