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

Commit 62c34638 authored by Dai Ngo's avatar Dai Ngo Committed by Greg Kroah-Hartman
Browse files

nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client. 



commit ab451ea952fe9d7afefae55ddb28943a148247fe upstream.

From RFC 7530 Section 16.34.5:

o  The server has not recorded an unconfirmed { v, x, c, *, * } and
   has recorded a confirmed { v, x, c, *, s }.  If the principals of
   the record and of SETCLIENTID_CONFIRM do not match, the server
   returns NFS4ERR_CLID_INUSE without removing any relevant leased
   client state, and without changing recorded callback and
   callback_ident values for client { x }.

The current code intends to do what the spec describes above but
it forgot to set 'old' to NULL resulting to the confirmed client
to be expired.

Fixes: 2b634821 ("nfsd: fix clid_inuse on mount with security change")
Signed-off-by: default avatarDai Ngo <dai.ngo@oracle.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarBruce Fields <bfields@fieldses.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 003bcee6

fs/nfsd/nfs4state.c

+3 −1
Original line number Diff line number Diff line
@@ -3446,8 +3446,10 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, 
			status = nfserr_clid_inuse;

			if (client_has_state(old)

					&& !same_creds(&unconf->cl_cred,

							&old->cl_cred))

							&old->cl_cred)) {

				old = NULL;

				goto out;

			}

			status = mark_client_expired_locked(old);

			if (status) {

				old = NULL;