From: Trond Myklebust <trondmy@gmail.com>
Date: Thu, 31 Oct 2019 22:40:33 +0000 (-0400)
Subject: NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid()
X-Git-Tag: v5.4-rc6~9^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79cc55422ce99be5964bde208ba8557174720893;p=platform%2Fkernel%2Flinux-rpi.git

NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid()

A typo in nfs4_refresh_delegation_stateid() means we're leaking an
RCU lock, and always returning a value of 'false'. As the function
description states, we were always supposed to return 'true' if a
matching delegation was found.

Fixes: 12f275cdd163 ("NFSv4: Retry CLOSE and DELEGRETURN on NFS4ERR_OLD_STATEID.")
Cc: stable@vger.kernel.org # v4.15+
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index ccdfb5f..af549d7 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -1191,7 +1191,7 @@ bool nfs4_refresh_delegation_stateid(nfs4_stateid *dst, struct inode *inode)
 	if (delegation != NULL &&
 	    nfs4_stateid_match_other(dst, &delegation->stateid)) {
 		dst->seqid = delegation->stateid.seqid;
-		return ret;
+		ret = true;
 	}
 	rcu_read_unlock();
 out: