diff mbox series

[security-next,v5,04/30] LSM: Remove initcall tracing

Message ID	20181011001846.30964-5-keescook@chromium.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-security-module-owner@kernel.org> From: Kees Cook <keescook@chromium.org> To: James Morris <jmorris@namei.org> Cc: Kees Cook <keescook@chromium.org>, Casey Schaufler <casey@schaufler-ca.com>, John Johansen <john.johansen@canonical.com>, Stephen Smalley <sds@tycho.nsa.gov>, Paul Moore <paul@paul-moore.com>, Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>, Mimi Zohar <zohar@linux.vnet.ibm.com>, Randy Dunlap <rdunlap@infradead.org>, Jordan Glover <Golden_Miller83@protonmail.ch>, LSM <linux-security-module@vger.kernel.org>, linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v5 04/30] LSM: Remove initcall tracing Date: Wed, 10 Oct 2018 17:18:20 -0700 Message-Id: <20181011001846.30964-5-keescook@chromium.org> In-Reply-To: <20181011001846.30964-1-keescook@chromium.org> References: <20181011001846.30964-1-keescook@chromium.org> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk
Series	LSM: Explict ordering \| expand [security-next,v5,00/30] LSM: Explict ordering [security-next,v5,01/30] LSM: Correctly announce start of LSM initialization [security-next,v5,02/30] vmlinux.lds.h: Avoid copy/paste of security_init section [security-next,v5,03/30] LSM: Rename .security_initcall section to .lsm_info [security-next,v5,04/30] LSM: Remove initcall tracing [security-next,v5,05/30] LSM: Convert from initcall to struct lsm_info [security-next,v5,06/30] vmlinux.lds.h: Move LSM_TABLE into INIT_DATA [security-next,v5,07/30] LSM: Convert security_initcall() into DEFINE_LSM() [security-next,v5,08/30] LSM: Record LSM name in struct lsm_info [security-next,v5,09/30] LSM: Provide init debugging infrastructure [security-next,v5,10/30] LSM: Don't ignore initialization failures [security-next,v5,11/30] LSM: Introduce LSM_FLAG_LEGACY_MAJOR [security-next,v5,12/30] LSM: Provide separate ordered initialization [security-next,v5,13/30] LoadPin: Rename boot param "enabled" to "enforce" [security-next,v5,14/30] LSM: Plumb visibility into optional "enabled" state [security-next,v5,15/30] LSM: Lift LSM selection out of individual LSMs [security-next,v5,16/30] LSM: Build ordered list of LSMs to initialize [security-next,v5,17/30] LSM: Introduce CONFIG_LSM [security-next,v5,18/30] LSM: Introduce "lsm=" for boottime LSM selection [security-next,v5,19/30] LSM: Tie enabling logic to presence in ordered list [security-next,v5,20/30] LSM: Prepare for reorganizing "security=" logic [security-next,v5,21/30] LSM: Refactor "security=" in terms of enable/disable [security-next,v5,22/30] LSM: Separate idea of "major" LSM from "exclusive" LSM [security-next,v5,23/30] apparmor: Remove SECURITY_APPARMOR_BOOTPARAM_VALUE [security-next,v5,24/30] selinux: Remove SECURITY_SELINUX_BOOTPARAM_VALUE [security-next,v5,25/30] LSM: Add all exclusive LSMs to ordered initialization [security-next,v5,26/30] LSM: Split LSM preparation from initialization [security-next,v5,27/30] LoadPin: Initialize as ordered LSM [security-next,v5,28/30] Yama: Initialize as ordered LSM [security-next,v5,29/30] LSM: Introduce enum lsm_order [security-next,v5,30/30] capability: Initialize as LSM_ORDER_FIRST

Commit Message

Kees Cook Oct. 11, 2018, 12:18 a.m. UTC

This partially reverts commit 58eacfffc417 ("init, tracing: instrument
security and console initcall trace events") since security init calls
are about to no longer resemble regular init calls.

Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: James Morris <james.morris@microsoft.com>
---
 security/security.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/security/security.c b/security/security.c
index 892fe6b691cf..41a5da2c7faf 100644
--- a/security/security.c
+++ b/security/security.c
@@ -30,8 +30,6 @@ 
 #include <linux/string.h>
 #include <net/flow.h>
 
-#include <trace/events/initcall.h>
-
 #define MAX_LSM_EVM_XATTR	2
 
 /* Maximum number of letters for an LSM name string */
@@ -47,17 +45,13 @@  static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
 
 static void __init do_security_initcalls(void)
 {
-	int ret;
 	initcall_t call;
 	initcall_entry_t *ce;
 
 	ce = __start_lsm_info;
-	trace_initcall_level("security");
 	while (ce < __end_lsm_info) {
 		call = initcall_from_entry(ce);
-		trace_initcall_start(call);
-		ret = call();
-		trace_initcall_finish(call, ret);
+		call();
 		ce++;
 	}
 }