From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755704AbaEDQK3 (ORCPT ); Sun, 4 May 2014 12:10:29 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36556 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754661AbaEDPm2 (ORCPT ); Sun, 4 May 2014 11:42:28 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 3.10 39/86] nfsd4: session needs room for following op to error out Date: Sun, 4 May 2014 11:41:14 -0400 Message-Id: <20140504154145.704021578@linuxfoundation.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <20140504154140.444932005@linuxfoundation.org> References: <20140504154140.444932005@linuxfoundation.org> User-Agent: quilt/0.60-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: "J. Bruce Fields" commit 4c69d5855a16f7378648c5733632628fa10431db upstream. Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4proc.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1307,6 +1307,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); }