From: Benjamin Coddington <bcodding@redhat.com>
Date: Wed, 17 Feb 2016 15:41:41 +0000 (-0500)
Subject: NFSv4: Fix a dentry leak on alias use
X-Git-Tag: v4.1.12-92~150^2~162
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f30925435571303618569baf88b003603f9dea5d;p=users%2Fjedix%2Flinux-maple.git

NFSv4: Fix a dentry leak on alias use

Orabug: 23330965

[ Upstream commit d9dfd8d741683347ee159d25f5b50c346a0df557 ]

In the case where d_add_unique() finds an appropriate alias to use it will
have already incremented the reference count.  An additional dget() to swap
the open context's dentry is unnecessary and will leak a reference.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Fixes: 275bb307865a3 ("NFSv4: Move dentry instantiation into the NFSv4-...")
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 038d8248fc62423b16810878f14d59070a0076cb)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1310a710192bf..dd85c4396ad4a 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2331,9 +2331,9 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
 		dentry = d_add_unique(dentry, igrab(state->inode));
 		if (dentry == NULL) {
 			dentry = opendata->dentry;
-		} else if (dentry != ctx->dentry) {
+		} else {
 			dput(ctx->dentry);
-			ctx->dentry = dget(dentry);
+			ctx->dentry = dentry;
 		}
 		nfs_set_verifier(dentry,
 				nfs_save_change_attribute(d_inode(opendata->dir)));