From patchwork Sat Sep 17 05:13:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9337001 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 E10C56077F for ; Sat, 17 Sep 2016 05:14:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D50E929FAD for ; Sat, 17 Sep 2016 05:14:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA10429FCB; Sat, 17 Sep 2016 05:14:03 +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 7988C29FAD for ; Sat, 17 Sep 2016 05:14:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757538AbcIQFOC (ORCPT ); Sat, 17 Sep 2016 01:14:02 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:34317 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756504AbcIQFN7 (ORCPT ); Sat, 17 Sep 2016 01:13:59 -0400 Received: by mail-io0-f194.google.com with SMTP id y139so2395586ioy.1 for ; Fri, 16 Sep 2016 22:13:58 -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=68dSVTAzsMrD47mO+N51hoQFH7D3h5+4NxGb2xXd0Jw=; b=hhtGJ/M71AwfX7FImzMkFQ6uGlsUCz1Ik9X7KTgWyIQCb5o8kKE0GAsVckYeXLQUWS WQSbBCGmbq8HXe9FVpKYlI8YPEg19GTxxuW2xcHJQINWA2urtsu00auyU1nlboTolxjz U5L10i3DRA57f/n5SY/y5/1NPC0FNLXR6OX0PeovFBmaa9ZGdaL8ySDZjq58lYSTcQjg hzjbrdMA15Am2TXHi1N1ffgfgsq4oX8WpcXqMQ8VqcmI2GK53q3rmIvX8FtydxI4C4OU RggNlqhW3A2ZnQpsqxP+OXblYKuPCOKVFKYqNh+gogYjZ5mEQkfEUc9HEBVOJDm09lqJ W/4A== 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=68dSVTAzsMrD47mO+N51hoQFH7D3h5+4NxGb2xXd0Jw=; b=BSeF9tIT+IxJJttpymGaSEkLdiB59XsiJNPfwK5BjfPajC7vng+ZFsKbU8GkEQyG35 4I2urWfx9WUvsm507YMLk4lvEJIj8XW678+1L4NlLtD+G9lP/QtsAhT7/XxStQ9AbPxv kDD0g5NPG+mNxTo1CYDrZZVYAh4HAlAyJgn6yO3yCl0tDS9tbKp4R7JCFFeNyAsDZmnB Xw2CPoewMhKVRMut3DDkCB6akwa+5VzxmIu65qZYmU+1nkG3mqVR4mdGxNC2eBmC2Zlc OHEKnYgXM8speKW0YlCf2+tMiXMtwHoDDuZJWZCdYeIn7xfYJQ6tZleiDTQOEswpyaaG Z8Fg== X-Gm-Message-State: AE9vXwO2T75k6HKTfJ2QTHwYUInwf8F0t1wgu3Ig0pNuOSWLc+A0KxdY7IT+xEW2xBkK3w== X-Received: by 10.107.23.134 with SMTP id 128mr28392395iox.113.1474089238343; Fri, 16 Sep 2016 22:13:58 -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 d15sm4993916ioj.19.2016.09.16.22.13.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:57 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 24/25] NFSv4: Don't test open_stateid unless it is set Date: Sat, 17 Sep 2016 01:13:32 -0400 Message-Id: <1474089213-104014-25-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-24-git-send-email-trond.myklebust@primarydata.com> References: <1474089213-104014-1-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-2-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-3-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-4-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-5-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-6-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-7-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-8-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-9-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-10-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-11-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-12-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-13-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-14-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-15-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-16-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-17-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-18-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-19-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-20-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-21-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-22-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-23-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-24-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 need to test the NFS_OPEN_STATE flag for whether or not the open_stateid is valid. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 08c6e46c5b95..e4f2008cde7d 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2583,6 +2583,11 @@ static int nfs41_check_open_stateid(struct nfs4_state *state) struct rpc_cred *cred = state->owner->so_cred; int status; + if (test_bit(NFS_OPEN_STATE, &state->flags) == 0) { + if (test_bit(NFS_DELEGATED_STATE, &state->flags) == 0) + return NFS_OK; + return -NFS4ERR_BAD_STATEID; + } /* If a state reset has been done, test_stateid is unneeded */ if ((test_bit(NFS_O_RDONLY_STATE, &state->flags) == 0) && (test_bit(NFS_O_WRONLY_STATE, &state->flags) == 0) &&