On 09/24/2018 05:18 PM, Kees Cook wrote:
> 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.
>
> Cc: James Morris <jmor...@namei.org>
> Cc: "Serge E. Hallyn" <se...@hallyn.com>
> Cc: Abderrahmane Benbachir <abderrahmane.benbac...@polymtl.ca>
> Cc: Steven Rostedt (VMware) <rost...@goodmis.org>
> Cc: linux-security-mod...@vger.kernel.org
> Signed-off-by: Kees Cook <keesc...@chromium.org>
Reviewed-by: John Johansen <john.johan...@canonical.com>
though I do think it would be a good idea to add a new set
of trace points, but that can come as a separate patch
> ---
> security/security.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> 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++;
> }
> }
>
