From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Wed, 21 Jan 2015 19:37:44 +0000 (-0500)
Subject: NFSv4.1: Fix an Oops in nfs41_walk_client_list
X-Git-Tag: v3.16.35~2936
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41092c862a0599d01144b172d5ed0d3c4c030ceb;p=thirdparty%2Fkernel%2Fstable.git

NFSv4.1: Fix an Oops in nfs41_walk_client_list

commit 3175e1dcec40fab1a444c010087f2068b6b04732 upstream.

If we start state recovery on a client that failed to initialise correctly,
then we are very likely to Oops.

Reported-by: "Mkrtchyan, Tigran" <tigran.mkrtchyan@desy.de>
Link: http://lkml.kernel.org/r/130621862.279655.1421851650684.JavaMail.zimbra@desy.de
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 79b077df7f6fb..af02bf6a418fd 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -640,7 +640,7 @@ int nfs41_walk_client_list(struct nfs_client *new,
 			prev = pos;
 
 			status = nfs_wait_client_init_complete(pos);
-			if (status == 0) {
+			if (pos->cl_cons_state == NFS_CS_SESSION_INITING) {
 				nfs4_schedule_lease_recovery(pos);
 				status = nfs4_wait_clnt_recover(pos);
 			}