Commit 9484ae12 authored Feb 18, 2025 by Paul Moore

tomoyo: move initcalls to the LSM framework



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>

parent 06643d55

security/tomoyo/common.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,

security/tomoyo/securityfs_if.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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);

security/tomoyo/tomoyo.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -617,4 +617,5 @@ DEFINE_LSM(tomoyo) = {
		.flags = LSM_FLAG_LEGACY_MAJOR,
		.blobs = &tomoyo_blob_sizes,
		.init = tomoyo_init,
		.initcall_fs = tomoyo_interface_init,
		};