about summary refs log tree commit diff
path: root/arch/mips
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-08-17 00:46:26 -0400
committerRich Felker <dalias@aerifal.cx>2014-08-17 00:46:26 -0400
commitde7e99c58508ca70f0b1b8ef259a823a3766c434 (patch)
tree68fbc616cb85a0a5a2992f64080d19b25855088f /arch/mips
parentd338b506e39b1e2c68366b12be90704c635602ce (diff)
downloadmusl-de7e99c58508ca70f0b1b8ef259a823a3766c434.tar.gz
musl-de7e99c58508ca70f0b1b8ef259a823a3766c434.tar.xz
musl-de7e99c58508ca70f0b1b8ef259a823a3766c434.zip
make pointers used in robust list volatile
when manipulating the robust list, the order of stores matters,
because the code may be asynchronously interrupted by a fatal signal
and the kernel will then access the robust list in what is essentially
an async-signal context.

previously, aliasing considerations made it seem unlikely that a
compiler could reorder the stores, but proving that they could not be
reordered incorrectly would have been extremely difficult. instead
I've opted to make all the pointers used as part of the robust list,
including those in the robust list head and in the individual mutexes,
volatile.

in addition, the format of the robust list has been changed to point
back to the head at the end, rather than ending with a null pointer.
this is to match the documented kernel robust list ABI. the null
pointer, which was previously used, only worked because faults during
access terminate the robust list processing.
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/bits/alltypes.h.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/bits/alltypes.h.in b/arch/mips/bits/alltypes.h.in
index 6bd79429..4657d14d 100644
--- a/arch/mips/bits/alltypes.h.in
+++ b/arch/mips/bits/alltypes.h.in
@@ -17,7 +17,7 @@ TYPEDEF long time_t;
 TYPEDEF long suseconds_t;
 
 TYPEDEF struct { union { int __i[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; void *__p[6]; } __u; } pthread_mutex_t;
+TYPEDEF struct { union { int __i[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
 TYPEDEF struct { union { int __i[12]; void *__p[12]; } __u; } pthread_cond_t;
 TYPEDEF struct { union { int __i[8]; void *__p[8]; } __u; } pthread_rwlock_t;
 TYPEDEF struct { union { int __i[5]; void *__p[5]; } __u; } pthread_barrier_t;