From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 25 Oct 2019 04:03:11 +0000 (-0400)
Subject: autofs: fix a leak in autofs_expire_indirect()
X-Git-Tag: v4.19.89~243
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4bc855afd2e1b93bbc94f67e98b8ce867d89f09;p=thirdparty%2Fkernel%2Fstable.git

autofs: fix a leak in autofs_expire_indirect()

[ 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>
---

diff --git a/fs/autofs/expire.c b/fs/autofs/expire.c
index 28d9c2b1b3bb3..70e9afe589fbf 100644
--- a/fs/autofs/expire.c
+++ b/fs/autofs/expire.c
@@ -501,9 +501,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);