summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2013-12-07 17:26:27 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-10 21:45:15 -0500
commit12663bfc97c8b3fdb292428105dd92d563164050 (patch)
tree3cfc0b33e9c96636e397c9c19806208735556b14 /net/core
parent88b07b3660362049769f36c94f2c5a623424c992 (diff)
downloadlinux-12663bfc97c8b3fdb292428105dd92d563164050.tar.bz2
net: unix: allow set_peek_off to fail
unix_dgram_recvmsg() will hold the readlock of the socket until recv is complete. In the same time, we may try to setsockopt(SO_PEEK_OFF) which will hang until unix_dgram_recvmsg() will complete (which can take a while) without allowing us to break out of it, triggering a hung task spew. Instead, allow set_peek_off to fail, this way userspace will not hang. Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Acked-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index ab20ed9b0f31..5393b4b719d7 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -882,7 +882,7 @@ set_rcvbuf:
case SO_PEEK_OFF:
if (sock->ops->set_peek_off)
- sock->ops->set_peek_off(sk, val);
+ ret = sock->ops->set_peek_off(sk, val);
else
ret = -EOPNOTSUPP;
break;