diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-01-28 16:01:04 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-15 09:55:05 +0200 |
| commit | 0ca6add471b10cc5a3570fe1c5c8093032a5b88b (patch) | |
| tree | bc9e1deef89811a15e6bba662bed157fc379fbcf | |
| parent | ca2ad538ba4734fbc3d6a03caedc68113ff0a3e9 (diff) | |
| download | lwn-0ca6add471b10cc5a3570fe1c5c8093032a5b88b.tar.gz lwn-0ca6add471b10cc5a3570fe1c5c8093032a5b88b.zip | |
nfsd4: session needs room for following op to error out
commit 4c69d5855a16f7378648c5733632628fa10431db upstream.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 419572f33b72..622ede143585 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1349,6 +1349,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, /* If op is non-idempotent */ if (opdesc->op_flags & OP_MODIFIES_SOMETHING) { plen = opdesc->op_rsize_bop(rqstp, op); + /* + * If there's still another operation, make sure + * we'll have space to at least encode an error: + */ + if (resp->opcnt < args->opcnt) + plen += COMPOUND_ERR_SLACK_SPACE; op->status = nfsd4_check_resp_size(resp, plen); } |