From patchwork Tue Mar 20 20:43:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10297843 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 B5E3760386 for ; Tue, 20 Mar 2018 20:43:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7DBC29640 for ; Tue, 20 Mar 2018 20:43:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C3862965A; Tue, 20 Mar 2018 20:43:47 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 2449F29640 for ; Tue, 20 Mar 2018 20:43:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751372AbeCTUnp (ORCPT ); Tue, 20 Mar 2018 16:43:45 -0400 Received: from mail-io0-f170.google.com ([209.85.223.170]:34683 "EHLO mail-io0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751018AbeCTUno (ORCPT ); Tue, 20 Mar 2018 16:43:44 -0400 Received: by mail-io0-f170.google.com with SMTP id r18so4023732ioa.1 for ; Tue, 20 Mar 2018 13:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aKmAXT6oDRgDnKzaEilffGAjORDDfMafyE1bYyK+D+I=; b=jnyttzVpYnSQLHZTMBQdM1Rpu3qSQmZ8LEvADS3fk2BQjV/5irLhzALXZCP6cIlEnj NVyawY1iNKMJmXSHyvO1EdzvbTE4CXcq/7oFlLO0BgiWjUJhsWNO//L++rO9n5ARdvL4 pw7jeJO7Zc5M2T7oOP1XZ3tapjhbbictp0uwfjyRvcLHagJ0AKVqKQBBRdnfg2MkJVC6 qEiL+thl73LQiV9/dZme3s7E0R2jA9XaOLgHvdFDbVxROz0qySLg9UhclJigcwsQBij5 medtTXgEDVeE3gvBpQue3r6RlLbdq07WEZ2LYNeM7FQZjd+UVTo3T+HDxqmyXEg7RdMV b4Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aKmAXT6oDRgDnKzaEilffGAjORDDfMafyE1bYyK+D+I=; b=OiriIYwwQuLKDYgW/pjqcjq9s+cY9Xuzss/dt3cRswx/wN4Q67JaUahOBwGK0Hq5UY fbg52FLx5k9/hyJ8/9EZnO1nk5NS3HhR1qWRKudICY6lEff3iRR0semCBDPr7El9/LE8 2Itl95zdcP34NosMcMXURou51cn0wlFDIYKWiovDwNAj3/uVWzxFn/by17Af+9MQhYOi ajRUtuPfzZXe8EZlBkxcTtgU1el3KGFgKr1LWRW5IjwKoWDTEu9gvQhJjC10sgbRJkv3 nHc1XG3B2FWCjp8EIUAtpDU6BxedDZcMrJrUNT6F0SP23ydfpgBIZIeeavdW5pYmBO3W cytQ== X-Gm-Message-State: AElRT7FATbFbSgM67hEp0KpDUidt74uTlvxdPzCkE6crFshA3ThpBsuj 2gMWh/H9NziehgAxaoIMMX+TRaE= X-Google-Smtp-Source: AG47ELsfeoLnzAFdp9022bnobnggvYyVrFqCn+LHWkkHlOD7ryDSDCNHxX3XA8pAcc6JpUc01n1SAA== X-Received: by 10.107.63.68 with SMTP id m65mr16510889ioa.236.1521578623865; Tue, 20 Mar 2018 13:43:43 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id m191-v6sm317784itg.42.2018.03.20.13.43.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Mar 2018 13:43:43 -0700 (PDT) From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/8] NFSv4: Fix nfs4_return_incompatible_delegation Date: Tue, 20 Mar 2018 16:43:13 -0400 Message-Id: <20180320204320.93656-2-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180320204320.93656-1-trond.myklebust@primarydata.com> References: <20180320204320.93656-1-trond.myklebust@primarydata.com> MIME-Version: 1.0 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 The 'fmode' argument can take an FMODE_EXEC value, which we want to filter out before comparing to the delegation type. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 47f3c273245e..75b8ea08e6f7 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1669,6 +1669,7 @@ static void nfs4_return_incompatible_delegation(struct inode *inode, fmode_t fmo { struct nfs_delegation *delegation; + fmode &= FMODE_READ|FMODE_WRITE; rcu_read_lock(); delegation = rcu_dereference(NFS_I(inode)->delegation); if (delegation == NULL || (delegation->type & fmode) == fmode) {