| From | Ben Hutchings <> | Date | Mon, 28 Apr 2014 02:11:22 +0100 | Subject | [PATCH 3.2 62/94] nfsd4: session needs room for following op to error out |
| |
3.2.58-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "J. Bruce Fields" <bfields@redhat.com>
commit 4c69d5855a16f7378648c5733632628fa10431db upstream.
Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- fs/nfsd/nfs4proc.c | 6 ++++++ 1 file changed, 6 insertions(+)
--- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1224,6 +1224,12 @@ nfsd4_proc_compound(struct svc_rqst *rqs /* 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); }
|