From patchwork Thu Sep 22 17:38:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9345989 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 2619E60CDC for ; Thu, 22 Sep 2016 17:39:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20C452AC01 for ; Thu, 22 Sep 2016 17:39:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 153AF2AC04; Thu, 22 Sep 2016 17:39:39 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 87A222AC06 for ; Thu, 22 Sep 2016 17:39:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965794AbcIVRjf (ORCPT ); Thu, 22 Sep 2016 13:39:35 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:36828 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964779AbcIVRja (ORCPT ); Thu, 22 Sep 2016 13:39:30 -0400 Received: by mail-io0-f194.google.com with SMTP id z135so5610846ioe.3 for ; Thu, 22 Sep 2016 10:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xhFGAKXP85YwJz9Nnz+rAu9+Wp94VQ6PM4TDQuZ9k0M=; b=ETrlpW0uCNPnTfPk1CrvmRuQLTW0FeRhvHPRofBl9sznNlzPp9B0d9IqM8zHLnJiE1 W8GOeVaZMmQAnIQ+zawGdhO4PQif9D7YRN09Ho5wUY/w/eJ6E01d6b2eHbduT9eFMtfx ZM0gopDmD5gkDkFh0UbSaGzei52/sEPrnWtQKrazmbWNAxuAfy89wrEvOjIFaf4QYpcV 4TiHzJtpaGnzI3enNrvYLXiH6FKcb/ubd2Ok3f7C919Je4VhCcEaCu7y6TnKgoNrPP8H HOV9iLAD/8U835O38ke8EUoni6CMN1GMmZJqNKhrsu+Pa0Y5FoKJj6xSsjIUHb4gAyyb MMbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=xhFGAKXP85YwJz9Nnz+rAu9+Wp94VQ6PM4TDQuZ9k0M=; b=e9qCn9SJJMmCXqfHiC6rg109n0RjDPcDARIajAJKXow2GPukZOqjUSPyTT1v8UoN++ Rzmhmt1u0fdxIdaePlPaiyeUsdQgM5NvvakBAts8krkX59Po09mDlXVcPCfpzHmNOKkd WWFir0T7+2PxEzHcSnSJoDpLnIUOA8yJHD/BHNUC9Fy+YzULiQpeY/xCYCiXN1enTJjL V//kmNM2K6638QMcyNpWqHb+hp5GDD3suVLW/k1jDJc++vvpfk0P32i3qWa1RB+ADexb 8qW/Dh+3ASFPCmp8i6mv+ymV33BMh/H/uqnVwkzmW8fmCrufle3jHUf0/oTRKLegp5+d TkKg== X-Gm-Message-State: AE9vXwML2wtZ7fvOwDf63YjWDgLqynt6p5P/k3UiHcSYGO+ERFCEs8uQHVAAqH9LvyPvVA== X-Received: by 10.107.169.202 with SMTP id f71mr4321179ioj.161.1474565969524; Thu, 22 Sep 2016 10:39:29 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-108-86-94.adr01.mskg.mi.frontiernet.net. [50.108.86.94]) by smtp.gmail.com with ESMTPSA id e66sm1194267itd.22.2016.09.22.10.39.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 10:39:28 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v7 04/31] NFSv4: nfs4_copy_delegation_stateid() must fail if the delegation is invalid Date: Thu, 22 Sep 2016 13:38:54 -0400 Message-Id: <1474565961-21303-5-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474565961-21303-4-git-send-email-trond.myklebust@primarydata.com> References: <1474565961-21303-1-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-2-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-3-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-4-git-send-email-trond.myklebust@primarydata.com> 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 We must not allow the use of delegations that have been revoked or are being returned. Signed-off-by: Trond Myklebust Fixes: 869f9dfa4d6d ("NFSv4: Fix races between nfs_remove_bad_delegation()...") Signed-off-by: Trond Myklebust Cc: stable@vger.kernel.org # v3.19+ --- fs/nfs/delegation.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 86d2c748140b..b9c65421ed81 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -41,6 +41,17 @@ void nfs_mark_delegation_referenced(struct nfs_delegation *delegation) set_bit(NFS_DELEGATION_REFERENCED, &delegation->flags); } +static bool +nfs4_is_valid_delegation(const struct nfs_delegation *delegation, + fmode_t flags) +{ + if (delegation != NULL && (delegation->type & flags) == flags && + !test_bit(NFS_DELEGATION_REVOKED, &delegation->flags) && + !test_bit(NFS_DELEGATION_RETURNING, &delegation->flags)) + return true; + return false; +} + static int nfs4_do_check_delegation(struct inode *inode, fmode_t flags, bool mark) { @@ -50,9 +61,7 @@ nfs4_do_check_delegation(struct inode *inode, fmode_t flags, bool mark) flags &= FMODE_READ|FMODE_WRITE; rcu_read_lock(); delegation = rcu_dereference(NFS_I(inode)->delegation); - if (delegation != NULL && (delegation->type & flags) == flags && - !test_bit(NFS_DELEGATION_REVOKED, &delegation->flags) && - !test_bit(NFS_DELEGATION_RETURNING, &delegation->flags)) { + if (nfs4_is_valid_delegation(delegation, flags)) { if (mark) nfs_mark_delegation_referenced(delegation); ret = 1; @@ -894,7 +903,7 @@ bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags, flags &= FMODE_READ|FMODE_WRITE; rcu_read_lock(); delegation = rcu_dereference(nfsi->delegation); - ret = (delegation != NULL && (delegation->type & flags) == flags); + ret = nfs4_is_valid_delegation(delegation, flags); if (ret) { nfs4_stateid_copy(dst, &delegation->stateid); nfs_mark_delegation_referenced(delegation);