From 04d5ab182b780d12092711627ceac464b711bb00 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 9 Dec 2010 12:12:58 -0500 Subject: Fix race in qsort_r initialization. (cherry picked from commit fb88ac72c2dcbbd979c8798e4ea497818bb3e171) --- ChangeLog | 6 ++++++ stdlib/msort.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6a86ea7d13..ebb5342cbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-12-09 Ulrich Drepper + + [BZ #11655] + * stdlib/msort.c (qsort_r): Make sure both phys_pages and pagesize + are initialized. + 2010-12-09 Jakub Jelinek * string/bits/string3.h (memmove, bcopy): Remove __restrict. diff --git a/stdlib/msort.c b/stdlib/msort.c index 35cd4d0311..fc58f0d417 100644 --- a/stdlib/msort.c +++ b/stdlib/msort.c @@ -25,6 +25,7 @@ #include #include #include +#include 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); } -- cgit 1.4.1