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

Commit 41eb1670 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

nfsd: Add missing gen_confirm in nfsd4_setclientid() 



Commit 294ac32e "nfsd: protect clid and verifier generation with
client_lock" moved gen_confirm() to gen_clid().

After that commit, setclientid will return a bad reply with all-zero
verifier after copy_clid().

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 19311aa8

fs/nfsd/nfs4state.c

+3 −2
Original line number Diff line number Diff line
@@ -3049,10 +3049,11 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	unconf = find_unconfirmed_client_by_name(&clname, nn);

	if (unconf)

		unhash_client_locked(unconf);

	if (conf && same_verf(&conf->cl_verifier, &clverifier))

	if (conf && same_verf(&conf->cl_verifier, &clverifier)) {

		/* case 1: probable callback update */

		copy_clid(new, conf);

	else /* case 4 (new client) or cases 2, 3 (client reboot): */

		gen_confirm(new, nn);

	} else /* case 4 (new client) or cases 2, 3 (client reboot): */

		gen_clid(new, nn);

	new->cl_minorversion = 0;

	gen_callback(new, setclid, rqstp);