diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2013-12-07 17:26:27 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-15 15:27:11 -0800 |
| commit | e387172fe3c3f5d256f183c0f88c9f0dc5434a88 (patch) | |
| tree | 2869b0c303eb867b899857588ab9bf9a9f8c9f78 /net/batman-adv | |
| parent | fcbb1132558f68da2ce37a883be165129aa1eb31 (diff) | |
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>
Diffstat (limited to 'net/batman-adv')
0 files changed, 0 insertions, 0 deletions