]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
autofs: fix a leak in autofs_expire_indirect()
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 25 Oct 2019 04:03:11 +0000 (00:03 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Dec 2019 07:48:26 +0000 (08:48 +0100)
[ Upstream commit 03ad0d703df75c43f78bd72e16124b5b94a95188 ]

if the second call of should_expire() in there ends up
grabbing and returning a new reference to dentry, we need
to drop it before continuing.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/autofs/expire.c

index cdff0567aacb34eec648ccf648b531bfde26c455..2d01553a6d5860542105fd594fc141d467f9ff8d 100644 (file)
@@ -498,9 +498,10 @@ static struct dentry *autofs_expire_indirect(struct super_block *sb,
                 */
                how &= ~AUTOFS_EXP_LEAVES;
                found = should_expire(expired, mnt, timeout, how);
-               if (!found || found != expired)
-                       /* Something has changed, continue */
+               if (found != expired) { // something has changed, continue
+                       dput(found);
                        goto next;
+               }
 
                if (expired != dentry)
                        dput(dentry);