Skip to content

Commit d3ba8f8

Browse files
committed
safesetid: move initcalls to the LSM framework
Reviewed-by: Kees Cook <kees@kernel.org> Acked-by: Micah Morton <mortonm@chromium.org> Reviewed-by: John Johansen <john.johhansen@canonical.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
1 parent 9484ae1 commit d3ba8f8

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

security/safesetid/lsm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,5 @@ static int __init safesetid_security_init(void)
289289
DEFINE_LSM(safesetid_security_init) = {
290290
.id = &safesetid_lsmid,
291291
.init = safesetid_security_init,
292+
.initcall_fs = safesetid_init_securityfs,
292293
};

security/safesetid/lsm.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,6 @@ enum sid_policy_type _setid_policy_lookup(struct setid_ruleset *policy,
7070
extern struct setid_ruleset __rcu *safesetid_setuid_rules;
7171
extern struct setid_ruleset __rcu *safesetid_setgid_rules;
7272

73+
int safesetid_init_securityfs(void);
74+
7375
#endif /* _SAFESETID_H */

security/safesetid/securityfs.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ static const struct file_operations safesetid_gid_file_fops = {
308308
.write = safesetid_gid_file_write,
309309
};
310310

311-
static int __init safesetid_init_securityfs(void)
311+
int __init safesetid_init_securityfs(void)
312312
{
313313
int ret;
314314
struct dentry *policy_dir;
@@ -345,4 +345,3 @@ static int __init safesetid_init_securityfs(void)
345345
securityfs_remove(policy_dir);
346346
return ret;
347347
}
348-
fs_initcall(safesetid_init_securityfs);

0 commit comments

Comments
 (0)