diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-01-28 16:01:04 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-06 07:55:29 -0700 |
| commit | c5393b70f9229b3e68146c84888cbfc8be002d72 (patch) | |
| tree | 830d14c19ca3d010666e10d6494db5a9759985f4 /fs/nfsd | |
| parent | 4b034e7b55357d8fae469134405360d508d42f84 (diff) | |
| download | linux-3.10-c5393b70f9229b3e68146c84888cbfc8be002d72.tar.gz linux-3.10-c5393b70f9229b3e68146c84888cbfc8be002d72.tar.bz2 linux-3.10-c5393b70f9229b3e68146c84888cbfc8be002d72.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 27d74a29451..e0bfacd23a8 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1307,6 +1307,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); } |