From patchwork Thu Nov 24 10:07:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 127468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id B2A0A1007DE for ; Thu, 24 Nov 2011 21:07:49 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RTWDU-00045A-NN; Thu, 24 Nov 2011 10:07:40 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RTWDM-0003ym-Sh for kernel-team@lists.ubuntu.com; Thu, 24 Nov 2011 10:07:32 +0000 Received: from dynamic-adsl-94-36-80-95.clienti.tiscali.it ([94.36.80.95] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RTWDM-0005Nb-Nn for kernel-team@lists.ubuntu.com; Thu, 24 Nov 2011 10:07:32 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/6] Yama: fix default relationship to check thread group Date: Thu, 24 Nov 2011 11:07:25 +0100 Message-Id: <1322129246-5397-6-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1322129246-5397-1-git-send-email-paolo.pisati@canonical.com> References: <1322129246-5397-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Kees Cook Yet another case of a thread needing to match against the group leader. BugLink: http://bugs.launchpad.net/bugs/737676 Signed-off-by: Kees Cook Signed-off-by: Andy Whitcroft Acked-by: Brad Figg Signed-off-by: Tim Gardner (cherry picked from commit 47208c22ade02f2b0b95dc3cb38e9a30c5ac600a) BugLink: http://launchpad.net/bugs/893190 Signed-off-by: Paolo Pisati --- security/yama/yama_lsm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index 1fb1f90..f3e7d7f 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -169,6 +169,8 @@ static int task_is_descendant(struct task_struct *parent, rcu_read_lock(); read_lock(&tasklist_lock); + if (!thread_group_leader(parent)) + parent = parent->group_leader; while (walker->pid > 0) { if (!thread_group_leader(walker)) walker = walker->group_leader;