On Thu, Aug 14, 2025 at 6:54 PM Paul Moore <p...@paul-moore.com> wrote:
>
> Reviewed-by: Kees Cook <k...@kernel.org>
> Signed-off-by: Paul Moore <p...@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(-)
Tetsuo, does this look okay to you?
> 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 ed0f7b052a85..a015cf0c4a00 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.50.1
--
paul-moore.com
