From patchwork Mon Nov 19 18:52:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 200132 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 48C682C009B for ; Tue, 20 Nov 2012 05:52:34 +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 1TaWSE-0001hd-Kb; Mon, 19 Nov 2012 18:52:22 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TaWSC-0001hS-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 F2D74330770 for ; Mon, 19 Nov 2012 10:52:19 -0800 (PST) Received: by salmon.rtg.net (Postfix, from userid 1000) id 8BDC420BDF; Mon, 19 Nov 2012 11:52:19 -0700 (MST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] Revert "UBUNTU: SAUCE: SECCOMP: audit: always report seccomp violations" Date: Mon, 19 Nov 2012 11:52:18 -0700 Message-Id: <1353351139-26868-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 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 BugLink: http://bugs.launchpad.net/bugs/1079469 This reverts commit 7b162efee4ef7d01077038a5fba6867fac53d711. --- include/linux/audit.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index 4a2f0d6..22f292a 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -510,7 +510,8 @@ void audit_core_dumps(long signr); static inline void audit_seccomp(unsigned long syscall, long signr, int code) { - __audit_seccomp(syscall, signr, code); + if (unlikely(!audit_dummy_context())) + __audit_seccomp(syscall, signr, code); } static inline void audit_ptrace(struct task_struct *t)