summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2016-06-29 08:26:59 +0200
committerMiklos Szeredi <mszeredi@redhat.com>2016-06-29 08:26:59 +0200
commita4859d75944a726533ab86d24bb5ffd1b2b7d6cc (patch)
tree1a1c97b15b21d90334b1ca0d0c47bae2cf0e2595 /fs
parent4c2e07c6a29e0129e975727b9f57eede813eea85 (diff)
downloadlinux-a4859d75944a726533ab86d24bb5ffd1b2b7d6cc.tar.gz
linux-a4859d75944a726533ab86d24bb5ffd1b2b7d6cc.tar.bz2
linux-a4859d75944a726533ab86d24bb5ffd1b2b7d6cc.zip
ovl: fix dentry leak for default_permissions
When using the 'default_permissions' mount option, ovl_permission() on non-directories was missing a dput(alias), resulting in "BUG Dentry still in use". Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> Fixes: 8d3095f4ad47 ("ovl: default permissions") Cc: <stable@vger.kernel.org> # v4.5+
Diffstat (limited to 'fs')
-rw-r--r--fs/overlayfs/inode.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 1dbeab6cf96e..8514d692042b 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -121,16 +121,18 @@ int ovl_permission(struct inode *inode, int mask)
err = vfs_getattr(&realpath, &stat);
if (err)
- return err;
+ goto out_dput;
+ err = -ESTALE;
if ((stat.mode ^ inode->i_mode) & S_IFMT)
- return -ESTALE;
+ goto out_dput;
inode->i_mode = stat.mode;
inode->i_uid = stat.uid;
inode->i_gid = stat.gid;
- return generic_permission(inode, mask);
+ err = generic_permission(inode, mask);
+ goto out_dput;
}
/* Careful in RCU walk mode */