From patchwork Mon Nov 19 18:52:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 200131 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 D16B42C0081 for ; Tue, 20 Nov 2012 05:52:33 +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 1TaWSH-0001ho-1D; Mon, 19 Nov 2012 18:52:25 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TaWSC-0001hT-W0 for kernel-team@lists.ubuntu.com; Mon, 19 Nov 2012 18:52:21 +0000 Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id 28B6E330790 for ; Mon, 19 Nov 2012 10:52:20 -0800 (PST) Received: by salmon.rtg.net (Postfix, from userid 1000) id C82C720BC4; Mon, 19 Nov 2012 11:52:19 -0700 (MST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] seccomp: forcing auditing of kill condition Date: Mon, 19 Nov 2012 11:52:19 -0700 Message-Id: <1353351139-26868-2-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1353351139-26868-1-git-send-email-tim.gardner@canonical.com> References: <1353351139-26868-1-git-send-email-tim.gardner@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 BugLink: http://bugs.launchpad.net/bugs/1079469 Instead of auditing all seccomp actions, only force the reporting of those that kill a process. All others should be checked for an existing audit context on the process. (This improves the adjustment that commit 426ae7eee59e3de2a4c14ccfc30df0a7d64709fe was attempting.) Signed-off-by: Kees Cook Acked-by: Herton Krzesinski Signed-off-by: Tim Gardner --- kernel/seccomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index ee376be..9002cfa 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -443,7 +443,7 @@ int __secure_computing(int this_syscall) #ifdef SECCOMP_DEBUG dump_stack(); #endif - audit_seccomp(this_syscall, exit_sig, ret); + __audit_seccomp(this_syscall, exit_sig, ret); do_exit(exit_sig); #ifdef CONFIG_SECCOMP_FILTER skip: