diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2013-12-13 10:54:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-15 15:28:48 -0800 |
commit | 57bc52eb25cff3ddd096598bf40e9be7673eb83a (patch) | |
tree | 8f7532908125414ad662d5d0d050dec2c21f22ea /net | |
parent | 36ffb5708649eb5215c14548d692406bc287cb24 (diff) | |
download | linux-3.10-57bc52eb25cff3ddd096598bf40e9be7673eb83a.tar.gz linux-3.10-57bc52eb25cff3ddd096598bf40e9be7673eb83a.tar.bz2 linux-3.10-57bc52eb25cff3ddd096598bf40e9be7673eb83a.zip |
net: unix: allow bind to fail on mutex lock
[ Upstream commit 37ab4fa7844a044dc21fde45e2a0fc2f3c3b6490 ]
This is similar to the set_peek_off patch where calling bind while the
socket is stuck in unix_dgram_recvmsg() will block and cause a hung task
spew after a while.
This is also the last place that did a straightforward mutex_lock(), so
there shouldn't be any more of these patches.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/unix/af_unix.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 2ee993c7732..3ca7927520b 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -717,7 +717,9 @@ static int unix_autobind(struct socket *sock) int err; unsigned int retries = 0; - mutex_lock(&u->readlock); + err = mutex_lock_interruptible(&u->readlock); + if (err) + return err; err = 0; if (u->addr) @@ -876,7 +878,9 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) goto out; addr_len = err; - mutex_lock(&u->readlock); + err = mutex_lock_interruptible(&u->readlock); + if (err) + goto out; err = -EINVAL; if (u->addr) |