diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-01-24 13:53:50 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-02-27 14:28:42 +0000 |
| commit | 60bfb26f95813ca8c779fbc16ade031dc85f5394 (patch) | |
| tree | 453dd24f851d28b338e98efbdd57004e0adb5481 /net | |
| parent | b67534c3cd56238e3adfbcd79407e8b4d3c11734 (diff) | |
| download | linux-stable-60bfb26f95813ca8c779fbc16ade031dc85f5394.tar.gz linux-stable-60bfb26f95813ca8c779fbc16ade031dc85f5394.tar.bz2 linux-stable-60bfb26f95813ca8c779fbc16ade031dc85f5394.zip | |
af_unix: fix struct pid memory leak
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 <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>
[bwh: Backported to 3.2: cookie is *sicob->scm, not scm]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/unix/af_unix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 30a8899388d2..6cb363d2b894 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2100,6 +2100,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; } |