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

nfsd4: simplify reading of opnum 



The comment here is totally bogus:
	- OP_WRITE + 1 is RELEASE_LOCKOWNER.  Maybe there was some older
	  version of the spec in which that served as a sort of
	  OP_ILLEGAL?  No idea, but it's clearly wrong now.
	- In any case, I can't see that the spec says anything about
	  what to do if the client sends us less ops than promised.
	  It's clearly nutty client behavior, and we should do
	  whatever's easiest: returning an xdr error (even though it
	  won't be consistent with the error on the last op returned)
	  seems fine to me.

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

fs/nfsd/nfs4xdr.c

+2 −32
Original line number Diff line number Diff line
@@ -1624,38 +1624,8 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 
		op = &argp->ops[i];

		op->replay = NULL;



		/*

		 * We can't use READ_BUF() here because we need to handle

		 * a missing opcode as an OP_WRITE + 1. So we need to check

		 * to see if we're truly at the end of our buffer or if there

		 * is another page we need to flip to.

		 */



		if (argp->p == argp->end) {

			if (argp->pagelen < 4) {

				/* There isn't an opcode still on the wire */

				op->opnum = OP_WRITE + 1;

				op->status = nfserr_bad_xdr;

				argp->opcnt = i+1;

				break;

			}



			/*

			 * False alarm. We just hit a page boundary, but there

			 * is still data available.  Move pointer across page

			 * boundary.  *snip from READ_BUF*

			 */

			argp->p = page_address(argp->pagelist[0]);

			argp->pagelist++;

			if (argp->pagelen < PAGE_SIZE) {

				argp->end = argp->p + (argp->pagelen>>2);

				argp->pagelen = 0;

			} else {

				argp->end = argp->p + (PAGE_SIZE>>2);

				argp->pagelen -= PAGE_SIZE;

			}

		}

		op->opnum = ntohl(*argp->p++);

		READ_BUF(4);

		READ32(op->opnum);



		if (op->opnum >= FIRST_NFS4_OP && op->opnum <= LAST_NFS4_OP)

			op->status = ops->decoders[op->opnum](argp, &op->u);

CRA Git | Maintained and supported by SUSTech CRA and CCSE