lsm: mark the lsm_id variables are marked as static

As the kernel test robot helpfully reminded us, all of the lsm_id
instances defined inside the various LSMs should be marked as static.
The one exception is Landlock which uses its lsm_id variable across
multiple source files with an extern declaration in a header file.

Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Paul Moore 2023-11-10 12:09:33 -05:00
parent 9ba8802c8b
commit b1a867eeb8
9 changed files with 9 additions and 9 deletions

View File

@ -1454,7 +1454,7 @@ struct lsm_blob_sizes apparmor_blob_sizes __ro_after_init = {
.lbs_task = sizeof(struct aa_task_ctx), .lbs_task = sizeof(struct aa_task_ctx),
}; };
const struct lsm_id apparmor_lsmid = { static const struct lsm_id apparmor_lsmid = {
.name = "apparmor", .name = "apparmor",
.id = LSM_ID_APPARMOR, .id = LSM_ID_APPARMOR,
}; };

View File

@ -16,7 +16,7 @@ static struct security_hook_list bpf_lsm_hooks[] __ro_after_init = {
LSM_HOOK_INIT(task_free, bpf_task_storage_free), LSM_HOOK_INIT(task_free, bpf_task_storage_free),
}; };
const struct lsm_id bpf_lsmid = { static const struct lsm_id bpf_lsmid = {
.name = "bpf", .name = "bpf",
.id = LSM_ID_BPF, .id = LSM_ID_BPF,
}; };

View File

@ -1441,7 +1441,7 @@ int cap_mmap_file(struct file *file, unsigned long reqprot,
#ifdef CONFIG_SECURITY #ifdef CONFIG_SECURITY
const struct lsm_id capability_lsmid = { static const struct lsm_id capability_lsmid = {
.name = "capability", .name = "capability",
.id = LSM_ID_CAPABILITY, .id = LSM_ID_CAPABILITY,
}; };

View File

@ -209,7 +209,7 @@ static int loadpin_load_data(enum kernel_load_data_id id, bool contents)
return loadpin_check(NULL, (enum kernel_read_file_id) id); return loadpin_check(NULL, (enum kernel_read_file_id) id);
} }
const struct lsm_id loadpin_lsmid = { static const struct lsm_id loadpin_lsmid = {
.name = "loadpin", .name = "loadpin",
.id = LSM_ID_LOADPIN, .id = LSM_ID_LOADPIN,
}; };

View File

@ -262,7 +262,7 @@ static int safesetid_task_fix_setgroups(struct cred *new, const struct cred *old
return 0; return 0;
} }
const struct lsm_id safesetid_lsmid = { static const struct lsm_id safesetid_lsmid = {
.name = "safesetid", .name = "safesetid",
.id = LSM_ID_SAFESETID, .id = LSM_ID_SAFESETID,
}; };

View File

@ -7031,7 +7031,7 @@ static int selinux_uring_cmd(struct io_uring_cmd *ioucmd)
} }
#endif /* CONFIG_IO_URING */ #endif /* CONFIG_IO_URING */
const struct lsm_id selinux_lsmid = { static const struct lsm_id selinux_lsmid = {
.name = "selinux", .name = "selinux",
.id = LSM_ID_SELINUX, .id = LSM_ID_SELINUX,
}; };

View File

@ -5006,7 +5006,7 @@ struct lsm_blob_sizes smack_blob_sizes __ro_after_init = {
.lbs_xattr_count = SMACK_INODE_INIT_XATTRS, .lbs_xattr_count = SMACK_INODE_INIT_XATTRS,
}; };
const struct lsm_id smack_lsmid = { static const struct lsm_id smack_lsmid = {
.name = "smack", .name = "smack",
.id = LSM_ID_SMACK, .id = LSM_ID_SMACK,
}; };

View File

@ -543,7 +543,7 @@ static void tomoyo_task_free(struct task_struct *task)
} }
} }
const struct lsm_id tomoyo_lsmid = { static const struct lsm_id tomoyo_lsmid = {
.name = "tomoyo", .name = "tomoyo",
.id = LSM_ID_TOMOYO, .id = LSM_ID_TOMOYO,
}; };

View File

@ -422,7 +422,7 @@ static int yama_ptrace_traceme(struct task_struct *parent)
return rc; return rc;
} }
const struct lsm_id yama_lsmid = { static const struct lsm_id yama_lsmid = {
.name = "yama", .name = "yama",
.id = LSM_ID_YAMA, .id = LSM_ID_YAMA,
}; };