nfsd: Add missing gen_confirm in nfsd4_setclientid()
Commit 294ac32e99
"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: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Родитель
19311aa835
Коммит
41eb16702c
|
@ -3049,10 +3049,11 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
|
||||||
unconf = find_unconfirmed_client_by_name(&clname, nn);
|
unconf = find_unconfirmed_client_by_name(&clname, nn);
|
||||||
if (unconf)
|
if (unconf)
|
||||||
unhash_client_locked(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 */
|
/* case 1: probable callback update */
|
||||||
copy_clid(new, conf);
|
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);
|
gen_clid(new, nn);
|
||||||
new->cl_minorversion = 0;
|
new->cl_minorversion = 0;
|
||||||
gen_callback(new, setclid, rqstp);
|
gen_callback(new, setclid, rqstp);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче