diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-01-28 16:01:04 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-30 16:23:23 +0100 |
| commit | 4b739882ad223508c474f0f9f15c9f9c032277c1 (patch) | |
| tree | bb6147ea5f1681c403282eb50510553da6caf257 /fs/nfsd | |
| parent | c674ae0967fa888e35c173a5026001dfdc0493c8 (diff) | |
| download | kernel_samsung_smdk4412-4b739882ad223508c474f0f9f15c9f9c032277c1.zip kernel_samsung_smdk4412-4b739882ad223508c474f0f9f15c9f9c032277c1.tar.gz kernel_samsung_smdk4412-4b739882ad223508c474f0f9f15c9f9c032277c1.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/nfsd')
| -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 e065497..5a6f27a 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1224,6 +1224,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); } |