diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-01-28 16:01:04 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-03-27 16:30:59 -0400 |
| commit | 4c69d5855a16f7378648c5733632628fa10431db (patch) | |
| tree | fdbe4ab531191f48af6e3333907d0813a9c003fb /fs/nfsd | |
| parent | de3997a7eeb9ea286b15879fdf8a95aae065b4f7 (diff) | |
| download | blackbird-op-linux-4c69d5855a16f7378648c5733632628fa10431db.tar.gz blackbird-op-linux-4c69d5855a16f7378648c5733632628fa10431db.zip | |
nfsd4: session needs room for following op to error out
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
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 82189b208af3..b9048e5e349e 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1359,6 +1359,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); } |
