This is a note to let you know that I've just added the patch titled
net: unix: allow bind to fail on mutex lock
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-unix-allow-bind-to-fail-on-mutex-lock.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Mon Jan 13 09:28:30 PST 2014
From: Sasha Levin <sasha.levin@xxxxxxxxxx>
Date: Fri, 13 Dec 2013 10:54:22 -0500
Subject: net: unix: allow bind to fail on mutex lock
From: Sasha Levin <sasha.levin@xxxxxxxxxx>
[ 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@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/unix/af_unix.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -712,7 +712,9 @@ static int unix_autobind(struct socket *
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)
@@ -845,7 +847,9 @@ static int unix_bind(struct socket *sock
goto out;
addr_len = err;
- mutex_lock(&u->readlock);
+ err = mutex_lock_interruptible(&u->readlock);
+ if (err)
+ goto out;
err = -EINVAL;
if (u->addr)
Patches currently in stable-queue which might be from sasha.levin@xxxxxxxxxx are
queue-3.4/net-unix-allow-set_peek_off-to-fail.patch
queue-3.4/net-unix-allow-bind-to-fail-on-mutex-lock.patch
queue-3.4/rds-prevent-dereference-of-a-null-device.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html