From: Miklos Szeredi Date: Wed, 29 Jun 2016 06:26:59 +0000 (+0200) Subject: ovl: fix dentry leak for default_permissions X-Git-Tag: v4.6.5~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5af2e4f46114089298ecae619ba1dbcc04d0135;p=thirdparty%2Fkernel%2Fstable.git ovl: fix dentry leak for default_permissions commit a4859d75944a726533ab86d24bb5ffd1b2b7d6cc upstream. 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 Fixes: 8d3095f4ad47 ("ovl: default permissions") Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index a4ff5d0d7db91..fe691b5684db5 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 */