redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

apparmor: rename mediated_filesystem() to path_mediated_fs() 

Rename to indicate the test is only about whether path mediation is used,
not whether other types of mediation might be used.

Signed-off-by: John Johansen <john.johansen@canonical.com>
zero-colors
John Johansen 2017-01-16 00:42:28 -08:00
parent 680cd62e91
commit efeee83a70
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/apparmor/include/lib.h
View File

@ -111,7 +111,7 @@ static inline unsigned int aa_dfa_null_transition(struct aa_dfa *dfa,
return aa_dfa_next(dfa, start, 0);
}
static inline bool mediated_filesystem(struct dentry *dentry)
static inline bool path_mediated_fs(struct dentry *dentry)
{
return !(dentry->d_sb->s_flags & MS_NOUSER);
}

14
security/apparmor/lsm.c
View File

@ -195,7 +195,7 @@ static inline int common_perm_path(int op, const struct path *path, u32 mask)
struct path_cond cond = { d_backing_inode(path->dentry)->i_uid,
d_backing_inode(path->dentry)->i_mode
};
if (!mediated_filesystem(path->dentry))
if (!path_mediated_fs(path->dentry))
return 0;
return common_perm(op, path, mask, &cond);
@ -216,7 +216,7 @@ static int common_perm_rm(int op, const struct path *dir,
struct inode *inode = d_backing_inode(dentry);
struct path_cond cond = { };
if (!inode || !mediated_filesystem(dentry))
if (!inode || !path_mediated_fs(dentry))
return 0;
cond.uid = inode->i_uid;
@ -240,7 +240,7 @@ static int common_perm_create(int op, const struct path *dir,
{
struct path_cond cond = { current_fsuid(), mode };
if (!mediated_filesystem(dir->dentry))
if (!path_mediated_fs(dir->dentry))
return 0;
return common_perm_dir_dentry(op, dir, dentry, mask, &cond);
@ -287,7 +287,7 @@ static int apparmor_path_link(struct dentry *old_dentry, const struct path *new_
struct aa_profile *profile;
int error = 0;
if (!mediated_filesystem(old_dentry))
if (!path_mediated_fs(old_dentry))
return 0;
profile = aa_current_profile();
@ -302,7 +302,7 @@ static int apparmor_path_rename(const struct path *old_dir, struct dentry *old_d
struct aa_profile *profile;
int error = 0;
if (!mediated_filesystem(old_dentry))
if (!path_mediated_fs(old_dentry))
return 0;
profile = aa_current_profile();
@ -349,7 +349,7 @@ static int apparmor_file_open(struct file *file, const struct cred *cred)
struct aa_profile *profile;
int error = 0;
if (!mediated_filesystem(file->f_path.dentry))
if (!path_mediated_fs(file->f_path.dentry))
return 0;
/* If in exec, permission is handled by bprm hooks.
@ -402,7 +402,7 @@ static int common_file_perm(int op, struct file *file, u32 mask)
BUG_ON(!fprofile);
if (!file->f_path.mnt ||
!mediated_filesystem(file->f_path.dentry))
!path_mediated_fs(file->f_path.dentry))
return 0;
profile = __aa_current_profile();