From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Ensure that the client lookup is done safely under the client_lock, so
we're not relying on the client_mutex.
Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
---
fs/nfsd/nfs4state.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index e8d92b468218..dd7667008554 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3430,13 +3430,17 @@ static __be32 lookup_clientid(clientid_t *clid,
* will be false.
*/
WARN_ON_ONCE(cstate->session);
+ spin_lock(&nn->client_lock);
found = find_confirmed_client(clid, false, nn);
- if (!found)
+ if (!found) {
+ spin_unlock(&nn->client_lock);
return nfserr_expired;
+ }
+ atomic_inc(&found->cl_refcount);
+ spin_unlock(&nn->client_lock);
/* Cache the nfs4_client in cstate! */
cstate->clp = found;
- atomic_inc(&found->cl_refcount);
return nfs_ok;
}
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
