mirror of https://github.com/torvalds/linux.git
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>
This commit is contained in:
parent
06643d5584
commit
9484ae1295
|
|
@ -924,6 +924,8 @@ struct tomoyo_task {
|
||||||
|
|
||||||
/********** Function prototypes. **********/
|
/********** Function prototypes. **********/
|
||||||
|
|
||||||
|
int tomoyo_interface_init(void);
|
||||||
|
|
||||||
bool tomoyo_address_matches_group(const bool is_ipv6, const __be32 *address,
|
bool tomoyo_address_matches_group(const bool is_ipv6, const __be32 *address,
|
||||||
const struct tomoyo_group *group);
|
const struct tomoyo_group *group);
|
||||||
bool tomoyo_compare_number_union(const unsigned long value,
|
bool tomoyo_compare_number_union(const unsigned long value,
|
||||||
|
|
|
||||||
|
|
@ -233,7 +233,7 @@ static void __init tomoyo_create_entry(const char *name, const umode_t mode,
|
||||||
*
|
*
|
||||||
* Returns 0.
|
* Returns 0.
|
||||||
*/
|
*/
|
||||||
static int __init tomoyo_interface_init(void)
|
int __init tomoyo_interface_init(void)
|
||||||
{
|
{
|
||||||
struct tomoyo_domain_info *domain;
|
struct tomoyo_domain_info *domain;
|
||||||
struct dentry *tomoyo_dir;
|
struct dentry *tomoyo_dir;
|
||||||
|
|
@ -269,5 +269,3 @@ static int __init tomoyo_interface_init(void)
|
||||||
tomoyo_load_builtin_policy();
|
tomoyo_load_builtin_policy();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
fs_initcall(tomoyo_interface_init);
|
|
||||||
|
|
|
||||||
|
|
@ -617,4 +617,5 @@ DEFINE_LSM(tomoyo) = {
|
||||||
.flags = LSM_FLAG_LEGACY_MAJOR,
|
.flags = LSM_FLAG_LEGACY_MAJOR,
|
||||||
.blobs = &tomoyo_blob_sizes,
|
.blobs = &tomoyo_blob_sizes,
|
||||||
.init = tomoyo_init,
|
.init = tomoyo_init,
|
||||||
|
.initcall_fs = tomoyo_interface_init,
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue