From: Paul Moore <paul@paul-moore.com>
To: linux-security-module@vger.kernel.org,
linux-integrity@vger.kernel.org, selinux@vger.kernel.org
Cc: john.johansen@canonical.com, zohar@linux.ibm.com,
roberto.sassu@huawei.com, wufan@kernel.org, mic@digikod.net,
gnoack@google.com, kees@kernel.org, mortonm@chromium.org,
casey@schaufler-ca.com, penguin-kernel@I-love.SAKURA.ne.jp,
nicolas.bouchinet@oss.cyber.gouv.fr, xiujianfeng@huawei.com
Subject: [PATCH v5 04/11] tomoyo: move initcalls to the LSM framework
Date: Fri, 17 Oct 2025 16:48:18 -0400 [thread overview]
Message-ID: <20251017204815.505363-15-paul@paul-moore.com> (raw)
In-Reply-To: <20251017204815.505363-12-paul@paul-moore.com>
Reviewed-by: Kees Cook <kees@kernel.org>
Reviewed-by: John Johansen <john.johhansen@canonical.com>
Acked-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: Paul Moore <paul@paul-moore.com>
---
security/tomoyo/common.h | 2 ++
security/tomoyo/securityfs_if.c | 4 +---
security/tomoyo/tomoyo.c | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h
index 0e8e2e959aef..3b2a97d10a5d 100644
--- a/security/tomoyo/common.h
+++ b/security/tomoyo/common.h
@@ -924,6 +924,8 @@ struct tomoyo_task {
/********** Function prototypes. **********/
+int tomoyo_interface_init(void);
+
bool tomoyo_address_matches_group(const bool is_ipv6, const __be32 *address,
const struct tomoyo_group *group);
bool tomoyo_compare_number_union(const unsigned long value,
diff --git a/security/tomoyo/securityfs_if.c b/security/tomoyo/securityfs_if.c
index 7e69747b2f77..33933645f5b9 100644
--- a/security/tomoyo/securityfs_if.c
+++ b/security/tomoyo/securityfs_if.c
@@ -233,7 +233,7 @@ static void __init tomoyo_create_entry(const char *name, const umode_t mode,
*
* Returns 0.
*/
-static int __init tomoyo_interface_init(void)
+int __init tomoyo_interface_init(void)
{
struct tomoyo_domain_info *domain;
struct dentry *tomoyo_dir;
@@ -269,5 +269,3 @@ static int __init tomoyo_interface_init(void)
tomoyo_load_builtin_policy();
return 0;
}
-
-fs_initcall(tomoyo_interface_init);
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index cb003c460dc2..c66e02ed8ee3 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -617,4 +617,5 @@ DEFINE_LSM(tomoyo) = {
.flags = LSM_FLAG_LEGACY_MAJOR,
.blobs = &tomoyo_blob_sizes,
.init = tomoyo_init,
+ .initcall_fs = tomoyo_interface_init,
};
--
2.51.1.dirty
next prev parent reply other threads:[~2025-10-17 20:49 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-17 20:24 [PATCH v5 0/34] Rework the LSM initialization Paul Moore
2025-10-17 20:24 ` [PATCH v5 01/34] lsm: split the notifier code out into lsm_notifier.c Paul Moore
2025-10-17 20:24 ` [PATCH v5 02/34] lsm: split the init code out into lsm_init.c Paul Moore
2025-10-17 20:24 ` [PATCH v5 03/34] lsm: consolidate lsm_allowed() and prepare_lsm() into lsm_prepare() Paul Moore
2025-10-17 20:24 ` [PATCH v5 04/34] lsm: introduce looping macros for the initialization code Paul Moore
2025-10-17 20:24 ` [PATCH v5 05/34] lsm: integrate report_lsm_order() code into caller Paul Moore
2025-10-17 20:24 ` [PATCH v5 06/34] lsm: integrate lsm_early_cred() and lsm_early_task() " Paul Moore
2025-10-17 20:24 ` [PATCH v5 07/34] lsm: rename ordered_lsm_init() to lsm_init_ordered() Paul Moore
2025-10-17 20:24 ` [PATCH v5 08/34] lsm: replace the name field with a pointer to the lsm_id struct Paul Moore
2025-10-17 20:24 ` [PATCH v5 09/34] lsm: rename the lsm order variables for consistency Paul Moore
2025-10-17 20:24 ` [PATCH v5 10/34] lsm: rework lsm_active_cnt and lsm_idlist[] Paul Moore
2025-10-17 20:24 ` [PATCH v5 11/34] lsm: get rid of the lsm_names list and do some cleanup Paul Moore
2025-10-17 20:24 ` [PATCH v5 12/34] lsm: rework the LSM enable/disable setter/getter functions Paul Moore
2025-10-17 20:24 ` [PATCH v5 13/34] lsm: rename exists_ordered_lsm() to lsm_order_exists() Paul Moore
2025-10-17 20:24 ` [PATCH v5 14/34] lsm: rename/rework append_ordered_lsm() into lsm_order_append() Paul Moore
2025-10-17 20:24 ` [PATCH v5 15/34] lsm: rename/rework ordered_lsm_parse() to lsm_order_parse() Paul Moore
2025-10-17 20:24 ` [PATCH v5 16/34] lsm: cleanup the LSM blob size code Paul Moore
2025-10-17 20:24 ` [PATCH v5 17/34] lsm: cleanup initialize_lsm() and rename to lsm_init_single() Paul Moore
2025-10-17 20:24 ` [PATCH v5 18/34] lsm: fold lsm_init_ordered() into security_init() Paul Moore
2025-10-17 20:24 ` [PATCH v5 19/34] lsm: add/tweak function header comment blocks in lsm_init.c Paul Moore
2025-10-17 20:24 ` [PATCH v5 20/34] lsm: cleanup the debug and console output " Paul Moore
2025-10-17 20:24 ` [PATCH v5 21/34] lsm: output available LSMs when debugging Paul Moore
2025-10-17 20:24 ` [PATCH v5 22/34] lsm: group lsm_order_parse() with the other lsm_order_*() functions Paul Moore
2025-10-17 20:48 ` [PATCH v5 01/11] loadpin: move initcalls to the LSM framework Paul Moore
2025-10-17 20:48 ` [PATCH v5 02/11] ipe: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 03/11] smack: " Paul Moore
2025-10-17 20:48 ` Paul Moore [this message]
2025-10-17 20:48 ` [PATCH v5 05/11] safesetid: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 06/11] apparmor: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 07/11] lockdown: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 08/11] ima,evm: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 09/11] selinux: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 10/11] lsm: consolidate all of the LSM framework initcalls Paul Moore
2025-10-17 20:48 ` [PATCH v5 11/11] lsm: add a LSM_STARTED_ALL notification event Paul Moore
2025-10-17 20:59 ` [PATCH v5 0/34] Rework the LSM initialization Paul Moore
2025-10-22 23:34 ` Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251017204815.505363-15-paul@paul-moore.com \
--to=paul@paul-moore.com \
--cc=casey@schaufler-ca.com \
--cc=gnoack@google.com \
--cc=john.johansen@canonical.com \
--cc=kees@kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mic@digikod.net \
--cc=mortonm@chromium.org \
--cc=nicolas.bouchinet@oss.cyber.gouv.fr \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=roberto.sassu@huawei.com \
--cc=selinux@vger.kernel.org \
--cc=wufan@kernel.org \
--cc=xiujianfeng@huawei.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).