Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+4 -3
+2
security/tomoyo/common.h
··· 924 924 925 925 /********** Function prototypes. **********/ 926 926 927 + int tomoyo_interface_init(void); 928 + 927 929 bool tomoyo_address_matches_group(const bool is_ipv6, const __be32 *address, 928 930 const struct tomoyo_group *group); 929 931 bool tomoyo_compare_number_union(const unsigned long value,
+1 -3
security/tomoyo/securityfs_if.c
··· 233 233 * 234 234 * Returns 0. 235 235 */ 236 - static int __init tomoyo_interface_init(void) 236 + int __init tomoyo_interface_init(void) 237 237 { 238 238 struct tomoyo_domain_info *domain; 239 239 struct dentry *tomoyo_dir; ··· 269 269 tomoyo_load_builtin_policy(); 270 270 return 0; 271 271 } 272 - 273 - fs_initcall(tomoyo_interface_init);
+1
security/tomoyo/tomoyo.c
··· 617 617 .flags = LSM_FLAG_LEGACY_MAJOR, 618 618 .blobs = &tomoyo_blob_sizes, 619 619 .init = tomoyo_init, 620 + .initcall_fs = tomoyo_interface_init, 620 621 };