From patchwork Wed May 9 12:02:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew W Elble X-Patchwork-Id: 10389311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D39A760236 for ; Wed, 9 May 2018 12:03:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C17AF28F25 for ; Wed, 9 May 2018 12:03:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2FB228D1D; Wed, 9 May 2018 12:03:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00EE5285A0 for ; Wed, 9 May 2018 12:03:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755541AbeEIMDX (ORCPT ); Wed, 9 May 2018 08:03:23 -0400 Received: from discipline.rit.edu ([129.21.6.207]:61481 "HELO discipline.rit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751052AbeEIMDW (ORCPT ); Wed, 9 May 2018 08:03:22 -0400 Received: (qmail 67570 invoked by uid 501); 9 May 2018 12:03:21 -0000 From: Andrew Elble To: linux-nfs@vger.kernel.org, bfields@fieldses.org, jlayton@kernel.org Cc: Andrew Elble Subject: [PATCH v2] nfsd: fix error handling in nfs4_set_delegation() Date: Wed, 9 May 2018 08:02:49 -0400 Message-Id: <20180509120249.62022-1-aweits@rit.edu> X-Mailer: git-send-email 2.10.1 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I noticed a memory corruption crash in nfsd in 4.17-rc1. This patch corrects the issue. Fix to return error if the delegation couldn't be hashed or there was a recall in progress. Use the existing error path instead of destroy_unhashed_delegation() for readability. Set the fields of the delegation to indicate that it does not need to be recalled. Signed-off-by: Andrew Elble Fixes: 353601e7d323c ("nfsd: create a separate lease for each delegation") --- v2: typo in changelog, set delegation recall-suppression fs/nfsd/nfs4state.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 71b87738c015..20463944cd61 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4372,12 +4372,26 @@ static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp, status = -EAGAIN; else status = hash_delegation_locked(dp, fp); + /* + * This delegation is doomed, tell the recall logic + * that it's being destroyed here. + */ + + if (status) { + dp->dl_time++; + list_del_init(&dp->dl_recall_lru); + dp->dl_stid.sc_type = NFS4_CLOSED_DELEG_STID; + } spin_unlock(&fp->fi_lock); spin_unlock(&state_lock); if (status) - destroy_unhashed_deleg(dp); + goto out_unlock; + return dp; + +out_unlock: + vfs_setlease(fp->fi_deleg_file, F_UNLCK, NULL, (void **)&dp); out_clnt_odstate: put_clnt_odstate(dp->dl_clnt_odstate); out_stid: