[3.19.y-ckt stable] Patch "af_unix: fix struct pid memory leak" has been added to the 3.19.y-ckt tree
Kamal Mostafa
kamal at canonical.com
Wed Mar 9 00:27:18 UTC 2016
This is a note to let you know that I have just added a patch titled
af_unix: fix struct pid memory leak
to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree
which can be found at:
http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue
This patch is scheduled to be released in version 3.19.8-ckt16.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.19.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Kamal
---8<------------------------------------------------------------
>From e7a4e1d8561d91c0e71287ab6b803a055e344f5f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet at google.com>
Date: Sun, 24 Jan 2016 13:53:50 -0800
Subject: 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 at google.com>
Signed-off-by: Eric Dumazet <edumazet at google.com>
Cc: Rainer Weikusat <rweikusat at mobileactivedefense.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
[ luis: backported to 3.16:
- use siocb->scm instead of &scm ]
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
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 59797d8..3a27d4c 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2154,6 +2154,7 @@ again:
if (signal_pending(current)) {
err = sock_intr_errno(timeo);
+ scm_destroy(siocb->scm);
goto out;
}
--
2.7.0
More information about the kernel-team
mailing list