commit 4d00bd56fe0092ff3c803f227a9964bffc873eb9
author Raymes Khoury <raymes@chromium.org> Thu Dec 09 17:12:58 2010
committer Raymes Khoury <raymes@chromium.org> Fri Sep 09 16:59:01 2011
tree d7ccd5f248ae42a936a2b962b59ad4254fe62d6e
parent 18cba386e41c58c94ffcd53df1cc5cbf91a83dec

Fix race in qsort_r initialization.

(cherry picked from commit fb88ac72c2dcbbd979c8798e4ea497818bb3e171)

BUG=chromium:84726
TEST=Build toolchain for x86-alex. Booted image.

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index cf07ced..91ba629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-09  Ulrich Drepper  <drepper@gmail.com>
+
+	[BZ #11655]
+	* stdlib/msort.c (qsort_r): Make sure both phys_pages and pagesize
+	are initialized.
+
 2010-12-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* string/bits/string3.h (memmove, bcopy): Remove __restrict.

stdlib/msort.c

diff --git a/stdlib/msort.c b/stdlib/msort.c
index 35cd4d0..fc58f0d 100644
--- a/stdlib/msort.c
+++ b/stdlib/msort.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <memcopy.h>
 #include <errno.h>
+#include <atomic.h>
 
 struct msort_param
 {
@@ -182,7 +183,7 @@
       static long int phys_pages;
       static int pagesize;
 
-      if (phys_pages == 0)
+      if (pagesize == 0)
 	{
 	  phys_pages = __sysconf (_SC_PHYS_PAGES);
 
@@ -197,6 +198,9 @@
 	     a quarter of the physical memory.  */
 	  phys_pages /= 4;
 
+	  /* Make sure phys_pages is written to memory.  */
+	  atomic_write_barrier ();
+
 	  pagesize = __sysconf (_SC_PAGESIZE);
 	}