leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LSM: Remove initcall tracing

Browse Source 
This partially reverts commit 58eacfffc4 ("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>
This commit is contained in:
Kees Cook 2018-10-10 17:18:20 -07:00 committed by James Morris
parent b048ae6e6c
commit 6907e3746f
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/security.c
View File

@ -30,8 +30,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <net/flow.h> #include <net/flow.h>
#include <trace/events/initcall.h>
#define MAX_LSM_EVM_XATTR 2 #define MAX_LSM_EVM_XATTR 2
/* Maximum number of letters for an LSM name string */ /* 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) static void __init do_security_initcalls(void)
{ {
int ret;
initcall_t call; initcall_t call;
initcall_entry_t *ce; initcall_entry_t *ce;
ce = __start_lsm_info; ce = __start_lsm_info;
trace_initcall_level("security");
while (ce < __end_lsm_info) { while (ce < __end_lsm_info) {
call = initcall_from_entry(ce); call = initcall_from_entry(ce);
trace_initcall_start(call); call();
ret = call();
trace_initcall_finish(call, ret);
ce++; ce++;
} }
} }