af_unix: Revert 'lock_interruptible' in stream receive code
authorRainer Weikusat <rweikusat@mobileactivedefense.com>
Wed, 16 Dec 2015 20:09:25 +0000 (20:09 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 30 Dec 2015 02:26:03 +0000 (02:26 +0000)
commit1a3b55eee77490693bb4d1338f24b6c9f11e3e1d
treee20e5e9942879cbbfef9716304c8241547ab4023
parent805ce945362d9e496563c9885e7fde00cbd83635
af_unix: Revert 'lock_interruptible' in stream receive code

[ Upstream commit 3822b5c2fc62e3de8a0f33806ff279fb7df92432 ]

With b3ca9b02b00704053a38bfe4c31dbbb9c13595d0, the AF_UNIX SOCK_STREAM
receive code was changed from using mutex_lock(&u->readlock) to
mutex_lock_interruptible(&u->readlock) to prevent signals from being
delayed for an indefinite time if a thread sleeping on the mutex
happened to be selected for handling the signal. But this was never a
problem with the stream receive code (as opposed to its datagram
counterpart) as that never went to sleep waiting for new messages with the
mutex held and thus, wouldn't cause secondary readers to block on the
mutex waiting for the sleeping primary reader. As the interruptible
locking makes the code more complicated in exchange for no benefit,
change it back to using mutex_lock.

Signed-off-by: Rainer Weikusat <rweikusat@mobileactivedefense.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/unix/af_unix.c