summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2013-12-07 23:26:27 +0100
committerDavid S. Miller <davem@davemloft.net>2013-12-11 03:45:15 +0100
commit12663bfc97c8b3fdb292428105dd92d563164050 (patch)
tree3cfc0b33e9c96636e397c9c19806208735556b14 /drivers/usb
parentMerge branch 'sfc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc (diff)
downloadlinux-12663bfc97c8b3fdb292428105dd92d563164050.tar.xz
linux-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 'drivers/usb')
0 files changed, 0 insertions, 0 deletions