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

Commit 49730501 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: reject bad forechannel attrs earlier 



This could simplify the logic a little later.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent d15c077e

fs/nfsd/nfs4state.c

+2 −4
Original line number Diff line number Diff line
@@ -1771,6 +1771,8 @@ nfsd4_create_session(struct svc_rqst *rqstp, 


	if (cr_ses->flags & ~SESSION4_FLAG_MASK_A)

		return nfserr_inval;

	if (check_forechannel_attrs(cr_ses->fore_channel))

		return nfserr_toosmall;



	nfs4_lock_state();

	unconf = find_unconfirmed_client(&cr_ses->clientid, true);
@@ -1811,10 +1813,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, 
	cr_ses->flags &= ~SESSION4_PERSIST;

	cr_ses->flags &= ~SESSION4_RDMA;



	status = nfserr_toosmall;

	if (check_forechannel_attrs(cr_ses->fore_channel))

		goto out;



	status = nfserr_jukebox;

	new = alloc_init_session(rqstp, conf, cr_ses);

	if (!new)