summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-03-25 15:22:49 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-03-28 00:47:28 -0400
commit8db0185659c33143915768bdd33fc2fb1b1cbb58 (patch)
tree536b1ad3e0c389aab15ae72b9f71f7f2fdb222d0
parentd360775217070ff0f4291e47d3f568f0fe0b7374 (diff)
downloadlinux-8db0185659c33143915768bdd33fc2fb1b1cbb58.tar.bz2
apparmor: remove useless checks for NULL ->mnt
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--security/apparmor/lsm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 7ae540565097..eadaa58bd6fd 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -215,7 +215,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 || !dir->mnt || !mediated_filesystem(dentry))
+ if (!inode || !mediated_filesystem(dentry))
return 0;
cond.uid = inode->i_uid;
@@ -239,7 +239,7 @@ static int common_perm_create(int op, const struct path *dir,
{
struct path_cond cond = { current_fsuid(), mode };
- if (!dir->mnt || !mediated_filesystem(dir->dentry))
+ if (!mediated_filesystem(dir->dentry))
return 0;
return common_perm_dir_dentry(op, dir, dentry, mask, &cond);