selinux: Standardize string literal usage for selinuxfs directory names
Switch class and policy_capabilities directory names to be referred to with global constants, consistent with booleans directory name. This will allow for easy consistency of naming in future development. Signed-off-by: Daniel Burgener <dburgener@linux.microsoft.com> Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Родитель
66ec384ad3
Коммит
613ba18798
|
@ -117,6 +117,10 @@ static void selinux_fs_info_free(struct super_block *sb)
|
|||
#define SEL_POLICYCAP_INO_OFFSET 0x08000000
|
||||
#define SEL_INO_MASK 0x00ffffff
|
||||
|
||||
#define BOOL_DIR_NAME "booleans"
|
||||
#define CLASS_DIR_NAME "class"
|
||||
#define POLICYCAP_DIR_NAME "policy_capabilities"
|
||||
|
||||
#define TMPBUFLEN 12
|
||||
static ssize_t sel_read_enforce(struct file *filp, char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
|
@ -1361,8 +1365,6 @@ static void sel_remove_entries(struct dentry *de)
|
|||
shrink_dcache_parent(de);
|
||||
}
|
||||
|
||||
#define BOOL_DIR_NAME "booleans"
|
||||
|
||||
static int sel_make_bools(struct selinux_policy *newpolicy, struct dentry *bool_dir,
|
||||
unsigned int *bool_num, char ***bool_pending_names,
|
||||
unsigned int **bool_pending_values)
|
||||
|
@ -2078,14 +2080,14 @@ static int sel_fill_super(struct super_block *sb, struct fs_context *fc)
|
|||
if (ret)
|
||||
goto err;
|
||||
|
||||
fsi->class_dir = sel_make_dir(sb->s_root, "class", &fsi->last_ino);
|
||||
fsi->class_dir = sel_make_dir(sb->s_root, CLASS_DIR_NAME, &fsi->last_ino);
|
||||
if (IS_ERR(fsi->class_dir)) {
|
||||
ret = PTR_ERR(fsi->class_dir);
|
||||
fsi->class_dir = NULL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
fsi->policycap_dir = sel_make_dir(sb->s_root, "policy_capabilities",
|
||||
fsi->policycap_dir = sel_make_dir(sb->s_root, POLICYCAP_DIR_NAME,
|
||||
&fsi->last_ino);
|
||||
if (IS_ERR(fsi->policycap_dir)) {
|
||||
ret = PTR_ERR(fsi->policycap_dir);
|
||||
|
|
Загрузка…
Ссылка в новой задаче