af_unix: fix incorrect revert of 'lock_interruptible' in stream receive code
authorWilly Tarreau <w@1wt.eu>
Sun, 24 Jan 2016 08:19:57 +0000 (09:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Jan 2016 05:49:27 +0000 (21:49 -0800)
commit85ec9232455406f1453bff56d8ef83c2aa2281c3
tree1dea942086a7382edb802b268d2b7775af9f04ca
parent14b58660bc26be42d272f7fb0d153ed8fc0a0c4e
af_unix: fix incorrect revert of 'lock_interruptible' in stream receive code

As reported by Sultan Qasim, commit 3822b5c ("af_unix: Revert
'lock_interruptible' in stream receive code") was accidently applied
at the wrong place in the backport that appeared in 3.10.95, it
affected unix_dgram_recvmsg() instead of unix_stream_recvmsg() due
to now similar code sections there. The dgram part needs to remain
but the stream part needs to be removed.

Reported-By: Sultan Qasim <sultanqasim@gmail.com>
Fixes: 3a57e78 (3.10.95)
Signed-off-by: Willy Tarreau <w@1wt.eu>
net/unix/af_unix.c