LSM: Remove initcall tracing (6907e374) · Commits · 戴 / test

This partially reverts commit ("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> Signed-off-by:

James Morris <james.morris@microsoft.com>

security/security.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -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++;
		}
		}

Admin message