forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

net: unix: allow bind to fail on mutex lock

Browse source 
[ Upstream commit 37ab4fa784 ]

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>
This commit is contained in:
Sasha Levin 2013-12-13 10:54:22 -05:00 • committed by Greg Kroah-Hartman
commit 57bc52eb25
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/unix/af_unix.c
View file

@ -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)