diff options
| author |   Sasha Levin <sasha.levin@oracle.com> | 2013-12-07 17:26:27 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-12-10 21:45:15 -0500 |
| commit | 12663bfc97c8b3fdb292428105dd92d563164050 (patch) | |
| tree | 3cfc0b33e9c96636e397c9c19806208735556b14 /include/linux/net.h | |
| parent | Merge branch 'sfc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc (diff) | |
| download | linux-dev-12663bfc97c8b3fdb292428105dd92d563164050.tar.xz linux-dev-12663bfc97c8b3fdb292428105dd92d563164050.zip | |
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 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 4bcee94cef93..69be3e6079c8 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -181,7 +181,7 @@ struct proto_ops { int offset, size_t size, int flags); ssize_t (*splice_read)(struct socket *sock, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); - void (*set_peek_off)(struct sock *sk, int val); + int (*set_peek_off)(struct sock *sk, int val); }; #define DECLARE_SOCKADDR(type, dst, src) \ |