From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 119CFC433F4 for ; Thu, 20 Sep 2018 16:23:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAF7421522 for ; Thu, 20 Sep 2018 16:23:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="QfxwvVp8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAF7421522 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731019AbeITWIB (ORCPT ); Thu, 20 Sep 2018 18:08:01 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:38822 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727680AbeITWIA (ORCPT ); Thu, 20 Sep 2018 18:08:00 -0400 Received: by mail-pf1-f193.google.com with SMTP id x17-v6so4614230pfh.5 for ; Thu, 20 Sep 2018 09:23:45 -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=HAekkvj+upuXCbRczMVdl859lF9VoTKVAjIU/VJ2coM=; b=QfxwvVp8tome4GK1jZVeIc9mB7z/4XM7KhcwWc279YFu1tRN6sQ/MZCqtZjreQ6xiE LQuHejng8P2HpZMrD4oJhARbDCcKXyAKv1A/tYHOqf7NRN37Mn6HzCuThF78wuNzMinJ AYPsa4SZ5AtoWzI9vYzGRSlh2u4Qe4YSN8ZVo= 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=HAekkvj+upuXCbRczMVdl859lF9VoTKVAjIU/VJ2coM=; b=BhCvpNyF5f7gMPaNrNR3PvgF+ejRwJow0T7631hpQWL/ki7r3ocF8vSl7y5ix4cS7p KB+5nBRth55pAa+db+1tkWDjVjp47ha1/sJJ0ppF9A9ARp8zfCFRxU1NAEMZgKNY8ymr aBjMBrUVZUkw11LAlXLtH8l4g6WrbSonQ3FfEMowQZ/DxifbpEfek5cpaLJY7hm5Q/yV OS4t4XfOl+tWFF0x8sCxzkYe+enqfcBBtzvFE5pT8fDwaoIFlduj9D7P16q//qDIe76g 8DahwctiB+Py/S6PycPX1xEotahvjoZafjwMfHM2L6udbNFPbbEDv+GUUvOkQCgh51pT EQ3g== X-Gm-Message-State: APzg51BUC8Re+O0wViiS9/TyUfLxA4c2BkXS9yc1dl36F1h60S7JX9LA RMQYdnzzQgKKv1Pzp8fhLfXdUA== X-Google-Smtp-Source: ANB0VdaLGaDTdYZ+gaoCAYoLtM95f6E7F0R+Yx3SsZgG8m8OHAeuEDYEanCZYNIk0v/TfAhThYTHoQ== X-Received: by 2002:a65:66d4:: with SMTP id c20-v6mr34957476pgw.55.1537460624804; Thu, 20 Sep 2018 09:23:44 -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 185-v6sm38786730pge.82.2018.09.20.09.23.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Sep 2018 09:23:43 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , LSM , Jonathan Corbet , linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v2 04/26] LSM: Remove initcall tracing Date: Thu, 20 Sep 2018 09:23:16 -0700 Message-Id: <20180920162338.21060-5-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180920162338.21060-1-keescook@chromium.org> References: <20180920162338.21060-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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++; } } -- 2.17.1