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=-8.8 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 99441ECE563 for ; Sun, 16 Sep 2018 00:31:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E5602147A for ; Sun, 16 Sep 2018 00:31:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="bJ/vxs2I" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E5602147A 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 S1728211AbeIPFwG (ORCPT ); Sun, 16 Sep 2018 01:52:06 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:43155 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728159AbeIPFwF (ORCPT ); Sun, 16 Sep 2018 01:52:05 -0400 Received: by mail-pl1-f195.google.com with SMTP id 38-v6so72339plc.10 for ; Sat, 15 Sep 2018 17:31:09 -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=Zc3U1dGV8mwshQSerhKfT2+ITr8Nf0CTzByoQRiUW8c=; b=bJ/vxs2IwgIRjZCfyokYBHRYrZW21XqaaAtedF7+6cihNFbqRroVZfzMz+CTkZELjI 5A8qBdf0ea4C2ZCchBR6YVruj8sGToea3BnxeoJQa4yIwUTn7PeWoLG8FmwM1Qm+D1go HQLP49gZI5G9J/LlHUKOyn40sKdw8ticwdesU= 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=Zc3U1dGV8mwshQSerhKfT2+ITr8Nf0CTzByoQRiUW8c=; b=k3raHPGSvbuueeNw/XsFbzeCCzjvE18+gh/C1e4MxhNFE5vBOyYRUqCJFn3DruaKII mJJykLxj/Qi4LlU4XJ2r80tWdP9nZ0i6oOeEAxGPACCNfB5RXCuVZMVr0kqAsvdL4She +99JKnDc94kNC7HkMhHYZ4+wnneEHvgSfp6KKE2QcxQdAMpYljWazZ0rlFG/ISfTdUxG SAKJp85hxOj1q2342MZhdpIG4xKhoa5xBI1GCgUNdbCXyv0AWx4sEzygAVRpLqSYKGRA XmYrYDJIt6HB2j/efBrNRdZ/8gi1quDTErmkYC4F8v2n/SrOYJv0x38GjPCXh6IThjDY i+6Q== X-Gm-Message-State: APzg51BV5SCgHioZTDB2TJ2BtPG7YIUQ9KVac7JFHavS98nHSmJ3aJoY 0OtaYvZ1Sw8hULtr50ElJBg1hA== X-Google-Smtp-Source: ANB0VdZJeoCIcmgN22bWWpsi1zF18p+fDoblROy+5qrFczM+etdLdh9aLq5nLUNVscGEt09WUBYajQ== X-Received: by 2002:a17:902:4601:: with SMTP id o1-v6mr18665236pld.202.1537057869426; Sat, 15 Sep 2018 17:31:09 -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 s85-v6sm17059211pfa.116.2018.09.15.17.31.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Sep 2018 17:31:08 -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 06/18] LSM: Convert security_initcall() into DEFINE_LSM() Date: Sat, 15 Sep 2018 17:30:47 -0700 Message-Id: <20180916003059.1046-7-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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of using argument-based initializers, switch to defining the contents of struct lsm_info on a per-LSM basis. This also drops the final use of the now inaccurate "initcall" naming. Signed-off-by: Kees Cook --- include/linux/lsm_hooks.h | 6 ++++-- security/apparmor/lsm.c | 4 +++- security/integrity/iint.c | 4 +++- security/selinux/hooks.c | 4 +++- security/smack/smack_lsm.c | 4 +++- security/tomoyo/tomoyo.c | 4 +++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index f3ddf9fdbdce..f8e618e2bdd2 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2045,11 +2045,13 @@ struct lsm_info { extern struct lsm_info __start_lsm_info[], __end_lsm_info[]; -#define security_initcall(lsm) \ +#define DEFINE_LSM(lsm) \ static const struct lsm_info __lsm_##lsm \ __used __section(.lsm_info.init) \ __aligned(sizeof(unsigned long)) \ - = { .init = lsm, } + = { \ + +#define END_LSM } #ifdef CONFIG_SECURITY_SELINUX_DISABLE /* diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 8b8b70620bbe..7fa7b4464cf4 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1606,4 +1606,6 @@ static int __init apparmor_init(void) return error; } -security_initcall(apparmor_init); +DEFINE_LSM(apparmor) + .init = apparmor_init, +END_LSM; diff --git a/security/integrity/iint.c b/security/integrity/iint.c index 70d21b566955..20e60df929a3 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -175,7 +175,9 @@ static int __init integrity_iintcache_init(void) 0, SLAB_PANIC, init_once); return 0; } -security_initcall(integrity_iintcache_init); +DEFINE_LSM(integrity) + .init = integrity_iintcache_init, +END_LSM; /* diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ad9a9b8e9979..469a90806bc6 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -7202,7 +7202,9 @@ void selinux_complete_init(void) /* SELinux requires early initialization in order to label all processes and objects when they are created. */ -security_initcall(selinux_init); +DEFINE_LSM(selinux) + .init = selinux_init, +END_LSM; #if defined(CONFIG_NETFILTER) diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 340fc30ad85d..1e1ace718e75 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -4882,4 +4882,6 @@ static __init int smack_init(void) * Smack requires early initialization in order to label * all processes and objects when they are created. */ -security_initcall(smack_init); +DEFINE_LSM(smack) + .init = smack_init, +END_LSM; diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 9f932e2d6852..a280d4eab456 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c @@ -550,4 +550,6 @@ static int __init tomoyo_init(void) return 0; } -security_initcall(tomoyo_init); +DEFINE_LSM(tomoyo) + .init = tomoyo_init, +END_LSM; -- 2.17.1