af_unix: fix a fatal race with bit fields

[mirror_ubuntu-zesty-kernel.git] / include / net / af_unix.h

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index a8836e8445ccf412c219b06bf9a9a4371fe959f5..dbdfd2b0f3b3dbe0a4470d83e19052db4ba3aa04 100644 (file)
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -57,9 +57,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
        struct socket_wq        peer_wq;
 };
 #define unix_sk(__sk) ((struct unix_sock *)__sk)