From patchwork Sun Sep 16 00:30:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10601609 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 EBF3913AD for ; Sun, 16 Sep 2018 00:31:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D91392A647 for ; Sun, 16 Sep 2018 00:31:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB1472A64D; Sun, 16 Sep 2018 00:31:15 +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 7E12A2A647 for ; Sun, 16 Sep 2018 00:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727547AbeIPFwC (ORCPT ); Sun, 16 Sep 2018 01:52:02 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:44479 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728036AbeIPFwC (ORCPT ); Sun, 16 Sep 2018 01:52:02 -0400 Received: by mail-pf1-f194.google.com with SMTP id k21-v6so5918802pff.11 for ; Sat, 15 Sep 2018 17:31:06 -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=jb16JJKYPrUkwwf+IIiV9x2fMWSaJBPCjHmkUCeoEUA=; b=Dbo5EBYAImPBD30afpw2UwkLCmYG0+qSGkSoO1j88KP43fd8dvD1lMtqISHtIwgDLP owuLG44J3rybcFPZaeQTsbn1XY7Fykn93fno4oHTrcUJ9ZrZTd1zQBsw0a0CiXgWlKu1 F+5wDsTeC1uRGsiqOoBYEKBfRd5O7wCmyT5tI= 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=jb16JJKYPrUkwwf+IIiV9x2fMWSaJBPCjHmkUCeoEUA=; b=kyPtb1apWgxxB9+7gVpu4LO9gm+KYyHzjjhbqTR4IxXMmwK+oGQRBv6xIQqyC9jkjc Mr1Xmg3rIaggtwA9yli4gidtVXUgHlQcXI/vE3zrIG1K0LValNMmvm2x6ZrLwYgTmFrm ygOxySJKTIOJeLOe2WkDOe4C8NwQswjc6cXAwkosGsv+YdXBoP7D18juMvUspnbF33yE s+9T31QMZ2C1R3qSbJDoiwjc1SIuuF67iitFDqW5XARBK4sHBZPTHfvoRFWH9E84Kufs y0uDxJp/xWvZI1Xue3wGtYnqgKBadrr+7RrMjHZ79P9GrnYz+gajW8tR6V4191vbh3wF ruMg== X-Gm-Message-State: APzg51DL2Rigt851DjdCT1UPEAIcZIECnaphsssLZI+VJ4YTDoF7VM8y UGShVZDZKz0OFg3XDYzvBX4cDQ== X-Google-Smtp-Source: ANB0VdZCrHk5TTxNgXYNU4F2E1hFoHAgchTPyT3QaN70sMbcGo15nl2AR6knA9I6gLFFDVYPvngAhw== X-Received: by 2002:a63:6385:: with SMTP id x127-v6mr17867638pgb.413.1537057866487; Sat, 15 Sep 2018 17:31:06 -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 w5-v6sm12814326pfn.44.2018.09.15.17.31.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Sep 2018 17:31:03 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , LSM , LKLM Subject: [PATCH 03/18] LSM: Remove initcall tracing Date: Sat, 15 Sep 2018 17:30:44 -0700 Message-Id: <20180916003059.1046-4-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180916003059.1046-1-keescook@chromium.org> References: <20180916003059.1046-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. Signed-off-by: Kees Cook --- security/security.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/security/security.c b/security/security.c index d49d5ff8be4b..913eb73ff3f9 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++; } }