2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Eric Dumazet <[email protected]> commit fa0dc04df259ba2df3ce1920e9690c7842f8fa4b upstream. Dmitry reported a struct pid leak detected by a syzkaller program. Bug happens in unix_stream_recvmsg() when we break the loop when a signal is pending, without properly releasing scm. Fixes: b3ca9b02b007 ("net: fix multithreaded signal handling in unix recv routines") Reported-by: Dmitry Vyukov <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Cc: Rainer Weikusat <[email protected]> Signed-off-by: David S. Miller <[email protected]> Cc: Ben Hutchings <[email protected]> [wt: note, according to Rainer & Ben the bug was really introduced in 2.5.65, not by the commit mentionned in Fixes. 2.6.32 uses siocb->scm instead of scm] Signed-off-by: Willy Tarreau <[email protected]> --- net/unix/af_unix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 8e6a609..67f50be 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2018,6 +2018,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, if (signal_pending(current)) { err = sock_intr_errno(timeo); + scm_destroy(siocb->scm); goto out; } mutex_lock(&u->readlock); -- 1.7.12.2.21.g234cd45.dirty
