]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
af_unix: fix struct pid memory leak
authorEric Dumazet <edumazet@google.com>
Sun, 24 Jan 2016 21:53:50 +0000 (13:53 -0800)
committerJiri Slaby <jslaby@suse.cz>
Wed, 2 Mar 2016 15:29:03 +0000 (16:29 +0100)
[ Upstream commit fa0dc04df259ba2df3ce1920e9690c7842f8fa4b ]

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 <dvyukov@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Rainer Weikusat <rweikusat@mobileactivedefense.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
net/unix/af_unix.c

index 31b88dcb0f01da6a9b7c2589c2822ceee818a55a..5fb2d2af3e524fc9fcfbbc1e8bfe636ead715897 100644 (file)
@@ -2131,6 +2131,7 @@ again:
 
                        if (signal_pending(current)) {
                                err = sock_intr_errno(timeo);
+                               scm_destroy(siocb->scm);
                                goto out;
                        }