net: unix: allow set_peek_off to fail
authorSasha Levin <sasha.levin@oracle.com>
Sat, 7 Dec 2013 22:26:27 +0000 (17:26 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Jan 2014 23:28:47 +0000 (15:28 -0800)
commitd90d9ff6cac64e701f27291ecef12fdc48606bb6
treebc1c113caa56f26749ee1b226ca24117672c411e
parent90af0bf9303883865a8626f23b4b0ed60d4d10dc
net: unix: allow set_peek_off to fail

[ Upstream commit 12663bfc97c8b3fdb292428105dd92d563164050 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/net.h
net/core/sock.c
net/unix/af_unix.c