Re: [PATCH v4] net: sock: move ->sk_shutdown out of bitfields.

From: David Miller
Date: Fri May 20 2016 - 18:05:58 EST


From: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Date: Wed, 18 May 2016 19:19:27 +0300

> ->sk_shutdown bits share one bitfield with some other bits in sock struct,
> such as ->sk_no_check_[r,t]x, ->sk_userlocks ...
> sock_setsockopt() may write to these bits, while holding the socket lock.
>
> In case of AF_UNIX sockets, we change ->sk_shutdown bits while holding only
> unix_state_lock(). So concurrent setsockopt() and shutdown() may lead
> to corrupting these bits.
>
> Fix this by moving ->sk_shutdown bits out of bitfield into a separate byte.
> This will not change the 'struct sock' size since ->sk_shutdown moved into
> previously unused 16-bit hole.
>
> Signed-off-by: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
> Suggested-by: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>

Looks good, applied and queued up for -stable.

Thanks.