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

Commit 94836ecf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux 

Pull nfsd bugfix from Bruce Fields:
 "Fix a 4.11 regression that triggers a BUG() on an attempt to use an
  unsupported NFSv4 compound op"

* tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix oops on unsupported operation
parents 057a650b 05b7278d

fs/nfsd/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2489,7 +2489,7 @@ bool nfsd4_spo_must_allow(struct svc_rqst *rqstp) 


int nfsd4_max_reply(struct svc_rqst *rqstp, struct nfsd4_op *op)

{

	if (op->opnum == OP_ILLEGAL)

	if (op->opnum == OP_ILLEGAL || op->status == nfserr_notsupp)

		return op_encode_hdr_size * sizeof(__be32);



	BUG_ON(OPDESC(op)->op_rsize_bop == NULL);