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

Commit 30cff1ff authored by Benny Halevy's avatar Benny Halevy Committed by J. Bruce Fields
Browse files

nfsd: return nfserr_minor_vers_mismatch when compound minorversion != 0 



Check minorversion once before decoding any operation and reject with
nfserr_minor_vers_mismatch if != 0 (this still happens in nfsd4_proc_compound).
In this case return a zero length resultdata array as required by RFC3530.

minorversion 1 processing will have its own vector of decoders.

Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 07cad1d2

fs/nfsd/nfs4xdr.c

+3 −7
Original line number Diff line number Diff line
@@ -1019,6 +1019,9 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 
		}

	}



	if (argp->minorversion != 0)

		argp->opcnt = 0;



	for (i = 0; i < argp->opcnt; i++) {

		op = &argp->ops[i];

		op->replay = NULL;
@@ -1057,13 +1060,6 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 
		op->opnum = ntohl(*argp->p++);



		switch (op->opnum) {

		case 2: /* Reserved operation */

			op->opnum = OP_ILLEGAL;

			if (argp->minorversion == 0)

				op->status = nfserr_op_illegal;

			else

				op->status = nfserr_minor_vers_mismatch;

			break;

		case OP_ACCESS:

			op->status = nfsd4_decode_access(argp, &op->u.access);

			break;