aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-04-21 16:37:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-04-21 16:37:48 -0700
commit94836ecf1e7378b64d37624fbb81fe48fbd4c772 (patch)
tree64724914a5d2b6c7ef61fba246f2ae630e0b955b
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentnfsd: fix oops on unsupported operation (diff)
downloadlinux-dev-94836ecf1e7378b64d37624fbb81fe48fbd4c772.tar.xz
linux-dev-94836ecf1e7378b64d37624fbb81fe48fbd4c772.zip
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
-rw-r--r--fs/nfsd/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index cbeeda1e94a2..d86031b6ad79 100644
--- 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);