From patchwork Wed Mar 9 23:12:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 595393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id ABEA7140322; Thu, 10 Mar 2016 10:14:09 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1adnIs-0002cE-Pt; Wed, 09 Mar 2016 23:14:06 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1adnHJ-0001i2-RJ for kernel-team@lists.ubuntu.com; Wed, 09 Mar 2016 23:12:29 +0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1adnHJ-0002UM-C9; Wed, 09 Mar 2016 23:12:29 +0000 Received: from kamal by fourier with local (Exim 4.86) (envelope-from ) id 1adnHG-0003YL-Mv; Wed, 09 Mar 2016 15:12:26 -0800 From: Kamal Mostafa To: Eric Dumazet Subject: [3.13.y-ckt stable] Patch "af_unix: fix struct pid memory leak" has been added to the 3.13.y-ckt tree Date: Wed, 9 Mar 2016 15:12:25 -0800 Message-Id: <1457565145-13622-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.0 X-Extended-Stable: 3.13 Cc: Rainer Weikusat , Kamal Mostafa , kernel-team@lists.ubuntu.com, "David S . Miller" , Dmitry Vyukov X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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.13.y-queue branch of the 3.13.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.13.y-queue This patch is scheduled to be released in version 3.13.11-ckt36. 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.13.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ---8<------------------------------------------------------------ From 96ee3ff0236605317e00e2ad78688a4757296a51 Mon Sep 17 00:00:00 2001 From: Eric Dumazet 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 Signed-off-by: Eric Dumazet Cc: Rainer Weikusat Signed-off-by: David S. Miller [ luis: backported to 3.16: - use siocb->scm instead of &scm ] Signed-off-by: Luis Henriques Signed-off-by: Kamal Mostafa --- net/unix/af_unix.c | 1 + 1 file changed, 1 insertion(+) -- 2.7.0 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index e6b0213..496ce9c 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2147,6 +2147,7 @@ again: if (signal_pending(current)) { err = sock_intr_errno(timeo); + scm_destroy(siocb->scm); goto out; }