Sasha Levin
12663bfc97
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>
2013-12-10 21:45:15 -05:00
Merge branch 'acpica'
2013-11-27 01:03:27 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-11-23 16:18:25 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-11-23 16:18:25 -08:00
Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
2013-11-21 18:46:56 +10:00
For the 3.13 merge window we have a couple of new drivers for the AMS
2013-11-15 16:37:40 -08:00
net: unix: allow set_peek_off to fail
2013-12-10 21:45:15 -05:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-18 15:50:07 -08:00
tcp_memcontrol: Cleanup/fix cg_proto->memory_pressure handling.
2013-12-05 21:01:01 -05:00
Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next
2013-11-17 08:22:19 -08:00
Main batch of InfiniBand/RDMA changes for 3.13:
2013-11-18 15:36:04 -08:00
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
2013-11-08 10:43:40 +00:00
target_core_alua: Store supported ALUA states
2013-11-20 11:26:37 -08:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-12-02 10:13:09 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-12-02 10:09:07 -08:00
fbdev changes for 3.13
2013-11-14 14:44:20 +09:00
Features:
2013-11-15 13:34:37 +09:00
12663bfc97