Commit 37ab4fa7 authored Dec 13, 2013 by Sasha Levin Committed by David S. Miller Dec 17, 2013

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: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d1fc5024

net/unix/af_unix.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -718,7 +718,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)
		@@ -877,7 +879,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)