nfsd: fix oops on unsupported operation

olgakorn · J. Bruce Fields · commit 05b7278d510a · 2017-04-13T11:18:56.000-04:00
I'm hitting the BUG in nfsd4_max_reply() at fs/nfsd/nfs4proc.c:2495 when client sends an operation the server doesn't support. in nfsd4_max_reply() it checks for NULL rsize_bop but a non-supported operation wouldn't have that set. Cc: Kinglong Mee <kinglongmee@gmail.com> Fixes: 2282cd2 "NFSD: Get response size before operation..." Signed-off-by: J. Bruce Fields <bfields@redhat.com>
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);`