diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-05-06 10:49:21 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-08-24 22:12:48 -0400 |
| commit | b7571e4cd39ae860379138b883bc5f57a8553184 (patch) | |
| tree | 331f475565a52362b1b1d83d89edd305f723fcf2 /fs/nfsd/nfs4xdr.c | |
| parent | 34b1744c91ccd44811005822106945fa80ecbff2 (diff) | |
| download | op-kernel-dev-b7571e4cd39ae860379138b883bc5f57a8553184.zip op-kernel-dev-b7571e4cd39ae860379138b883bc5f57a8553184.tar.gz | |
nfsd4: skip encoder in trivial error cases
Most encoders do nothing in the error case. But they can still screw
things up in that case: most errors happen very early in rpc processing,
possibly before argument fields are filled in and bounds-tested, so
encoders that do anything other than immediately bail on error can
easily crash in odd error cases.
So just handle errors centrally most of the time to remove the chance of
error.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 7d683e3..08badcf 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4461,6 +4461,9 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op) if (op->opnum == OP_ILLEGAL) goto status; + if (op->status && opdesc && + !(opdesc->op_flags & OP_NONTRIVIAL_ERROR_ENCODE)) + goto status; BUG_ON(op->opnum < 0 || op->opnum >= ARRAY_SIZE(nfsd4_enc_ops) || !nfsd4_enc_ops[op->opnum]); encoder = nfsd4_enc_ops[op->opnum]; |
