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

torvalds · torvalds · commit 94836ecf1e73 · 2017-04-21T16:37:48.000-07:00
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
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2489,7 +2489,7 @@ bool nfsd4_spo_must_allow(struct svc_rqst *rqstp)`
`2489`	`2489`
`2490`	`2490`	`int nfsd4_max_reply(struct svc_rqst rqstp, struct nfsd4_op op)`
`2491`	`2491`	`{`
`2492`		`- if (op->opnum == OP_ILLEGAL)`
	`2492`	`+ if (op->opnum == OP_ILLEGAL \|\| op->status == nfserr_notsupp)`
`2493`	`2493`	`return op_encode_hdr_size * sizeof(__be32);`
`2494`	`2494`
`2495`	`2495`	`BUG_ON(OPDESC(op)->op_rsize_bop == NULL);`