Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64590daa authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Handle errors correctly in nfs41_walk_client_list 



Both nfs41_walk_client_list and nfs40_walk_client_list expect the
'status' variable to be set to the value -NFS4ERR_STALE_CLIENTID
if the loop fails to find a match.
The problem is that the 'pos->cl_cons_state > NFS_CS_READY' changes
the value of 'status', and sets it either to the value '0' (which
indicates success), or to the value EINTR.

Cc: stable@vger.kernel.org # 3.7.x: 7b1f1fd1: NFSv4/4.1: Fix bugs in
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 263b4509

fs/nfs/nfs4client.c

+5 −3
Original line number Diff line number Diff line
@@ -498,9 +498,10 @@ int nfs40_walk_client_list(struct nfs_client *new, 
			prev = pos;



			status = nfs_wait_client_init_complete(pos);

			spin_lock(&nn->nfs_client_lock);

			if (status < 0)

				continue;

				goto out;

			status = -NFS4ERR_STALE_CLIENTID;

			spin_lock(&nn->nfs_client_lock);

		}

		if (pos->cl_cons_state != NFS_CS_READY)

			continue;
@@ -638,7 +639,8 @@ int nfs41_walk_client_list(struct nfs_client *new, 
			}

			spin_lock(&nn->nfs_client_lock);

			if (status < 0)

				continue;

				break;

			status = -NFS4ERR_STALE_CLIENTID;

		}

		if (pos->cl_cons_state != NFS_CS_READY)

			continue;