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

Commit 5283b03e authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfs/nfsd/sunrpc: enforce transport requirements for NFSv4 



NFSv4 requires a transport "that is specified to avoid network
congestion" (RFC 7530, section 3.1, paragraph 2).  In practical terms,
that means that you should not run NFSv4 over UDP. The server has never
enforced that requirement, however.

This patchset fixes this by adding a new flag to the svc_version that
states that it has these transport requirements. With that, we can check
that the transport has XPT_CONG_CTRL set before processing an RPC. If it
doesn't we reject it with RPC_PROG_MISMATCH.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 362142b2

fs/nfs/callback_xdr.c

+2 −0
Original line number Diff line number Diff line
@@ -1084,6 +1084,7 @@ struct svc_version nfs4_callback_version1 = { 
	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = true,

	.vs_need_cong_ctrl = true,

};



struct svc_version nfs4_callback_version4 = {
@@ -1093,4 +1094,5 @@ struct svc_version nfs4_callback_version4 = { 
	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = true,

	.vs_need_cong_ctrl = true,

};

fs/nfsd/nfs4proc.c

+7 −6
Original line number Diff line number Diff line
@@ -2543,6 +2543,7 @@ struct svc_version nfsd_version4 = { 
	.vs_dispatch		= nfsd_dispatch,

	.vs_xdrsize		= NFS4_SVC_XDRSIZE,

	.vs_rpcb_optnl		= true,

	.vs_need_cong_ctrl	= true,

};



/*

include/linux/sunrpc/svc.h

+3 −0
Original line number Diff line number Diff line
@@ -406,6 +406,9 @@ struct svc_version { 
	/* Don't care if the rpcbind registration fails */

	bool			vs_rpcb_optnl;



	/* Need xprt with congestion control */

	bool			vs_need_cong_ctrl;



	/* Override dispatch function (e.g. when caching replies).

	 * A return value of 0 means drop the request. 

	 * vs_dispatch == NULL means use default dispatcher.

net/sunrpc/svc.c

+15 −0
Original line number Diff line number Diff line
@@ -1169,6 +1169,21 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) 
	  !(versp = progp->pg_vers[vers]))

		goto err_bad_vers;



	/*

	 * Some protocol versions (namely NFSv4) require some form of

	 * congestion control.  (See RFC 7530 section 3.1 paragraph 2)

	 * In other words, UDP is not allowed. We mark those when setting

	 * up the svc_xprt, and verify that here.

	 *

	 * The spec is not very clear about what error should be returned

	 * when someone tries to access a server that is listening on UDP

	 * for lower versions. RPC_PROG_MISMATCH seems to be the closest

	 * fit.

	 */

	if (versp->vs_need_cong_ctrl &&

	    !test_bit(XPT_CONG_CTRL, &rqstp->rq_xprt->xpt_flags))

		goto err_bad_vers;



	procp = versp->vs_proc + proc;

	if (proc >= versp->vs_nproc || !procp->pc_func)

		goto err_bad_proc;