diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2013-05-01 05:24:03 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2016-01-29 22:12:50 +0100 |
| commit | 24ba3c534f7f6e17fb3fbdcee9427f05a0fd074e (patch) | |
| tree | e30acfea128ffe77e90a084c975b0cdc4ddadbc5 /include/net | |
| parent | 7e0e67b0bbd024c074cd9ac61c2a8f8ebb9be619 (diff) | |
af_unix: fix a fatal race with bit fields
commit 60bc851ae59bfe99be6ee89d6bc50008c85ec75d upstream.
Using bit fields is dangerous on ppc64/sparc64, as the compiler [1]
uses 64bit instructions to manipulate them.
If the 64bit word includes any atomic_t or spinlock_t, we can lose
critical concurrent changes.
This is happening in af_unix, where unix_sk(sk)->gc_candidate/
gc_maybe_cycle/lock share the same 64bit word.
This leads to fatal deadlock, as one/several cpus spin forever
on a spinlock that will never be available again.
A safer way would be to use a long to store flags.
This way we are sure compiler/arch wont do bad things.
As we own unix_gc_lock spinlock when clearing or setting bits,
we can use the non atomic __set_bit()/__clear_bit().
recursion_level can share the same 64bit location with the spinlock,
as it is set only with this spinlock held.
[1] bug fixed in gcc-4.8.0 :
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52080
Reported-by: Ambrose Feinstein <ambrose@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit 2ee9cbe7e7bfe2d36374288b818aa31b2c4981db)
[wt: adjusted context]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/af_unix.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index c364711174df..faf1d6dd0ec6 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -55,9 +55,10 @@ struct unix_sock { struct list_head link; atomic_long_t inflight; spinlock_t lock; - unsigned int gc_candidate : 1; - unsigned int gc_maybe_cycle : 1; unsigned char recursion_level; + unsigned long gc_flags; +#define UNIX_GC_CANDIDATE 0 +#define UNIX_GC_MAYBE_CYCLE 1 wait_queue_head_t peer_wait; wait_queue_t peer_wake; }; |