From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on archive.lwn.net X-Spam-Level: X-Spam-Status: No, score=-6.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id 7D69D7D982 for ; Thu, 11 Oct 2018 00:19:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726991AbeJKHng (ORCPT ); Thu, 11 Oct 2018 03:43:36 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33962 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726989AbeJKHnf (ORCPT ); Thu, 11 Oct 2018 03:43:35 -0400 Received: by mail-pg1-f194.google.com with SMTP id g12-v6so3282358pgs.1 for ; Wed, 10 Oct 2018 17:19:01 -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=SVqtedufC5YNGveTdBgoJ/XYFtvod6rEynhSC1mAznA=; b=Tfywul4y3Jb5yidWPPGYNAiurEwaGUe9aFxYHuEif8khyQl7SZCnhl9N8p1mFe/KvB YJPwsn0uN8UXYM21nZPS5pky4MhMMbRBKHSqC7V7MEzrcoiMvUpVxabFOeXxnYtD7iVa uzcrDnL/bQIgbI9bpl5+cmA0MFqvFt0aLJHzA= 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=SVqtedufC5YNGveTdBgoJ/XYFtvod6rEynhSC1mAznA=; b=SfAuvhnKcb8ddn+b0tyJJ6uSYO5vMvkI3wpoGrYZkwNIGDTwVzSotJDJxbJ7rW+Nsy iiSUVtpq6CVxf8xzO7Mb9Z7r1bLga6qXr5SxDOAnCb59xRFlrWJKbVlyftuYUoh53d7y Ah2o9MHiPDxZzBf/iAFbEzB3zjtU+GAW4OdJXbNqNVkIjUsLDw/O/7TyW191bVrMuM0M aDAO1IHen/uYQmAxwzDAZI3sq7tksHbZB9nkCLEq8+7STuqGftJGbRZjncbh/e4V04dp PNeBqnnpQtiiZTzye4M3YkZpsvKb63zGlDWIOSCSwKgyHHtrEh1I9xR6ZMi1x6UuTZIg uLeQ== X-Gm-Message-State: ABuFfoj1QGb7Td2/WQI5RWR5R19WP01WXGFTOdwesmXQ8X4BTx0k5nNr 3hUBjw/ezrFksr+gbND1tLdGWQ== X-Google-Smtp-Source: ACcGV618L5PGRFkI24cNpxITPpIoIIcqXUhzWYorSRWK7CReB4nFLMNQcDE47kdYCJCGY0tF3vhMsg== X-Received: by 2002:a63:e47:: with SMTP id 7-v6mr27888803pgo.320.1539217140928; Wed, 10 Oct 2018 17:19:00 -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 o62-v6sm32784578pfb.0.2018.10.10.17.18.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Oct 2018 17:18:58 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , Casey Schaufler , John Johansen , Stephen Smalley , Paul Moore , Tetsuo Handa , Mimi Zohar , Randy Dunlap , Jordan Glover , LSM , linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v5 07/30] LSM: Convert security_initcall() into DEFINE_LSM() Date: Wed, 10 Oct 2018 17:18:23 -0700 Message-Id: <20181011001846.30964-8-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011001846.30964-1-keescook@chromium.org> References: <20181011001846.30964-1-keescook@chromium.org> Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@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 Reviewed-by: Casey Schaufler Reviewed-by: James Morris --- include/linux/lsm_hooks.h | 5 ++--- 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, 17 insertions(+), 8 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index d13059feca09..9c6b4198ff5a 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2045,11 +2045,10 @@ struct lsm_info { extern struct lsm_info __start_lsm_info[], __end_lsm_info[]; -#define security_initcall(lsm) \ +#define DEFINE_LSM(lsm) \ static struct lsm_info __lsm_##lsm \ __used __section(.lsm_info.init) \ - __aligned(sizeof(unsigned long)) \ - = { .init = lsm, } + __aligned(sizeof(unsigned long)) #ifdef CONFIG_SECURITY_SELINUX_DISABLE /* diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 8b8b70620bbe..c4863956c832 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, +}; diff --git a/security/integrity/iint.c b/security/integrity/iint.c index 70d21b566955..94e8e1820748 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, +}; /* diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ad9a9b8e9979..6ca2e89ddbd6 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, +}; #if defined(CONFIG_NETFILTER) diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 340fc30ad85d..c62e26939a69 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, +}; diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 9f932e2d6852..b2d833999910 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, +}; -- 2.17.1