From patchwork Tue Sep 25 00:18:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10613085 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 617E814DA for ; Tue, 25 Sep 2018 00:18:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CE2F29E9D for ; Tue, 25 Sep 2018 00:18:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4107529F53; Tue, 25 Sep 2018 00:18:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A684229EC0 for ; Tue, 25 Sep 2018 00:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728274AbeIYGX0 (ORCPT ); Tue, 25 Sep 2018 02:23:26 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:33693 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728078AbeIYGX0 (ORCPT ); Tue, 25 Sep 2018 02:23:26 -0400 Received: by mail-pf1-f194.google.com with SMTP id d4-v6so9930739pfn.0 for ; Mon, 24 Sep 2018 17:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=grdTh6jgWyilD8yd1ADEbK7C00utpPYIiWkMyo43GXU=; b=WDUrBOFup3bgS3V1x1Go6KM1/ZIZHZznHJFiBJ2FwbSVplhb/hvi7CSZP6qHZUMbd/ 929mOJBuzYbyYOOE1oLY7DlyH+uPKZrIFsjGTrERVRghtfDhzvSqVAHqOYjsDNEzXktc VrutY4O+8Lb5M6lBhaAWe2/MVw0f9LAoNcb2g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=grdTh6jgWyilD8yd1ADEbK7C00utpPYIiWkMyo43GXU=; b=UfqwYeFwE2YWCavLMa3oXdII0SnDfCwvv77fbMl79h927m7FtTd9+GpAPckITECeXL jJZ/3gBzgPbG6sLEqaY7KPeEhCIEhSD3h7A2Lwfpvc8TKtjV2izs+O9Vt4zeC/3kw4dn h77z/B8MmK0jZdUQSz2Vniq3ZITDodbYXv9L7aHAMwtoU7dejDnzhMtltrA8xjIp9DMd nRmG9Og4TrH7mhZilwyb2tuFwGRKJsx3MaOguFshvLsvayHyrYmtkjfvDUWTa7d9EbWE NYoUCCud3DBEywg8qv43BRcqxAM9VmcfEsJ5QOFzFvqMUN2eSivYuNOaGDjQVSnepv7B VJ0A== X-Gm-Message-State: ABuFfoj81ynm2BM/AxwLgxvsr0bYTmhbA1yrlEa+JlrOrOpYnCmbVk4u bQshFBW9z/GI2lR1ml4pZ/WIyw== X-Google-Smtp-Source: ACcGV60Q+qQUcfOgrc942qlgSi/1M22qVFDImDAbsmJZ/SOrnCHJDrfeP/Y4IHCoF1FM5IPgnBcmVA== X-Received: by 2002:a62:444d:: with SMTP id r74-v6mr1006201pfa.96.1537834720182; Mon, 24 Sep 2018 17:18:40 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id y85-v6sm560016pfa.170.2018.09.24.17.18.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Sep 2018 17:18:37 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , "Serge E. Hallyn" , Abderrahmane Benbachir , Steven Rostedt , linux-security-module@vger.kernel.org, Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , Jonathan Corbet , linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v3 04/29] LSM: Remove initcall tracing Date: Mon, 24 Sep 2018 17:18:07 -0700 Message-Id: <20180925001832.18322-5-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925001832.18322-1-keescook@chromium.org> References: <20180925001832.18322-1-keescook@chromium.org> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: "Serge E. Hallyn" Cc: Abderrahmane Benbachir Cc: Steven Rostedt (VMware) Cc: linux-security-module@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: John Johansen --- 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 #include -#include - #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++; } }