From patchwork Fri Oct 6 04:44:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Hicks X-Patchwork-Id: 822192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3y7cWs3sfkz9t41; Fri, 6 Oct 2017 15:45:29 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1e0KVq-0002hr-Fx; Fri, 06 Oct 2017 04:45:26 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1e0KVo-0002gs-Jo for kernel-team@lists.ubuntu.com; Fri, 06 Oct 2017 04:45:24 +0000 Received: from 2.general.tyhicks.us.vpn ([10.172.64.53] helo=sec.l.tihix.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1e0KVo-0006LE-5g; Fri, 06 Oct 2017 04:45:24 +0000 From: Tyler Hicks To: kernel-team@lists.ubuntu.com Subject: [SRU][ZESTY][PATCH 1/8] Revert "UBUNTU: SAUCE: seccomp: log actions even when audit is disabled" Date: Fri, 6 Oct 2017 04:44:52 +0000 Message-Id: <1507265099-17845-2-git-send-email-tyhicks@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507265099-17845-1-git-send-email-tyhicks@canonical.com> References: <1507265099-17845-1-git-send-email-tyhicks@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 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" This reverts commit dc5d6059402681ebc29b1fc471a4518a7892903a. Upcoming changes that improve seccomp logging controls make this patch obsolete. Signed-off-by: Tyler Hicks Acked-by: Colin Ian King --- include/linux/audit.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/audit.h b/include/linux/audit.h index 1f693a4..f51fca8d 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -315,6 +315,9 @@ void audit_core_dumps(long signr); static inline void audit_seccomp(unsigned long syscall, long signr, int code) { + if (!audit_enabled) + return; + /* Force a record to be reported if a signal was delivered. */ if (signr || unlikely(!audit_dummy_context())) __audit_seccomp(syscall, signr, code);