Fix race in qsort_r initialization.

(cherry picked from commit fb88ac72c2dcbbd979c8798e4ea497818bb3e171)

diff --git a/ChangeLog b/ChangeLog
index ece72c8e902ad56a3e9114f7c4fd7a8f3a651be0..7ebfb1eabc2549cb01c3be2c8390f6f0760863bb 100644 (file)
--- 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.

diff --git a/stdlib/msort.c b/stdlib/msort.c
index 35cd4d03117e211b50e2068a9898da46e3cb6fd5..fc58f0d4178b2e8eee61536d380df2800e012afa 100644 (file)
--- 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 @@ qsort_r (void *b, size_t n, size_t s, __compar_d_fn_t cmp, void *arg)
       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 @@ qsort_r (void *b, size_t n, size_t s, __compar_d_fn_t cmp, void *arg)
             a quarter of the physical memory.  */
          phys_pages /= 4;
 
+         /* Make sure phys_pages is written to memory.  */
+         atomic_write_barrier ();
+
          pagesize = __sysconf (_SC_PAGESIZE);
        }