Commit 37ab4fa7 authored by Sasha Levin's avatar Sasha Levin Committed by David S. Miller

net: unix: allow bind to fail on mutex lock

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: default avatarSasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1fc5024
...@@ -718,7 +718,9 @@ static int unix_autobind(struct socket *sock) ...@@ -718,7 +718,9 @@ static int unix_autobind(struct socket *sock)
int err; int err;
unsigned int retries = 0; unsigned int retries = 0;
mutex_lock(&u->readlock); err = mutex_lock_interruptible(&u->readlock);
if (err)
return err;
err = 0; err = 0;
if (u->addr) if (u->addr)
...@@ -877,7 +879,9 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -877,7 +879,9 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
goto out; goto out;
addr_len = err; addr_len = err;
mutex_lock(&u->readlock); err = mutex_lock_interruptible(&u->readlock);
if (err)
goto out;
err = -EINVAL; err = -EINVAL;
if (u->addr) if (u->addr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment