Thread (1 message) 1 message, 1 author, 2016-03-04
DORMANTno replies

[PATCH 2.6.32 16/55] af_unix: fix struct pid memory leak

From: Willy Tarreau <w@1wt.eu>
Date: 2016-03-04 16:15:20
Also in: lkml
Subsystem: networking [general], networking [unix sockets], the rest · Maintainers: "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Linus Torvalds

2.6.32-longterm review patch.  If anyone has any objections, please let me know.

------------------

From: Eric Dumazet <edumazet@google.com>

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 <redacted>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Ben Hutchings <redacted>
[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 <w@1wt.eu>
---
 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


Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help