Commit 1244f0b2 authored by NeilBrown's avatar NeilBrown Committed by Chuck Lever
Browse files

nfsd: nfsd4_spo_must_allow() must check this is a v4 compound request 



If the request being processed is not a v4 compound request, then
examining the cstate can have undefined results.

This patch adds a check that the rpc procedure being executed
(rq_procinfo) is the NFSPROC4_COMPOUND procedure.

Reported-by: default avatarOlga Kornievskaia <okorniev@redhat.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 0813c5f0

fs/nfsd/nfs4proc.c

+2 −1
Original line number Diff line number Diff line
@@ -3777,7 +3777,8 @@ bool nfsd4_spo_must_allow(struct svc_rqst *rqstp) 
	struct nfs4_op_map *allow = &cstate->clp->cl_spo_must_allow;

	u32 opiter;



	if (!cstate->minorversion)

	if (rqstp->rq_procinfo != &nfsd_version4.vs_proc[NFSPROC4_COMPOUND] ||

	    cstate->minorversion == 0)

		return false;



	if (cstate->spo_must_allowed)