]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Dec 2015 20:33:47 +0000 (15:33 -0500)
commit3822b5c2fc62e3de8a0f33806ff279fb7df92432
treeb820d7ac997e8b1d4c2505416c7ef7a8c55b74c1
parent3036facbb7be3a169e35be3b271162b0fa564a2d
af_unix: Revert 'lock_interruptible' in stream receive code

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>
net/unix/af_unix.c