From patchwork Wed Mar 5 14:07:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 3774831 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E2D7A9F383 for ; Wed, 5 Mar 2014 14:07:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02C8520237 for ; Wed, 5 Mar 2014 14:07:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A7FE2025B for ; Wed, 5 Mar 2014 14:07:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753576AbaCEOHn (ORCPT ); Wed, 5 Mar 2014 09:07:43 -0500 Received: from mail-ie0-f180.google.com ([209.85.223.180]:45947 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752221AbaCEOHm (ORCPT ); Wed, 5 Mar 2014 09:07:42 -0500 Received: by mail-ie0-f180.google.com with SMTP id as1so1008039iec.25 for ; Wed, 05 Mar 2014 06:07:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CbRSab9IGgWBKO7qRlmia+YMhv8RcXEi6gZeVZNaif4=; b=jPU/PIaGnJTdOY7E7I4U+d2nSHshyo0tm0MW2gGbXu9Caht5W+q6s52zrLI2c4KYmN Xp5mlZUnHPJhO08bHmv24ka3pAnqajWO/AZf0jxdkuC67A421VJ7wz1HfLFEyqRcvNXE kXFqM6KC5Q4kCtTgaMHoSAVveruLQvOZHRWlqwFLD0/9kofhbur2/crXttCkjyXzNSX2 rZgF0E/pOeo/Pxe0OKxVxBtIT3uaZ5lowGWTEYCvTfjVqAbnqAsf2BaQcQU9Yz5lK50v S4tODRCIRyM7QoZMkn8FJ40xKEY7TmLn72zn6v998rZGl06IpHMVPg9OdIx1Qz5NVbIe /3ig== X-Gm-Message-State: ALoCoQkpBpmJ6y9u3hxt6vVthHERrl2MbGckLxr+hB8cS0UVZMnUzLVW9ITVNnCZSj3cjytA/cA5 X-Received: by 10.50.61.147 with SMTP id p19mr9100321igr.49.1394028462058; Wed, 05 Mar 2014 06:07:42 -0800 (PST) Received: from leira.trondhjem.org (c-98-209-19-95.hsd1.mi.comcast.net. [98.209.19.95]) by mx.google.com with ESMTPSA id m6sm13682148igx.9.2014.03.05.06.07.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Mar 2014 06:07:41 -0800 (PST) From: Trond Myklebust To: Andy Adamson Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 4/4] NFSv4: Fail the truncate() if the lock/open stateid is invalid Date: Wed, 5 Mar 2014 09:07:32 -0500 Message-Id: <1394028452-15956-5-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394028452-15956-4-git-send-email-trond.myklebust@primarydata.com> References: <1393959943-9919-1-git-send-email-trond.myklebust@primarydata.com> <1394028452-15956-1-git-send-email-trond.myklebust@primarydata.com> <1394028452-15956-2-git-send-email-trond.myklebust@primarydata.com> <1394028452-15956-3-git-send-email-trond.myklebust@primarydata.com> <1394028452-15956-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-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the open stateid could not be recovered, or the file locks were lost, then we should fail the truncate() operation altogether. Reported-by: Andy Adamson Link: http://lkml.kernel.org/r/1393954269-3974-1-git-send-email-andros@netapp.com Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 4778c55d0336..bc60a0f81019 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2398,13 +2398,16 @@ static int _nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred, if (nfs4_copy_delegation_stateid(&arg.stateid, inode, fmode)) { /* Use that stateid */ - } else if (truncate && state != NULL && nfs4_valid_open_stateid(state)) { + } else if (truncate && state != NULL) { struct nfs_lockowner lockowner = { .l_owner = current->files, .l_pid = current->tgid, }; - nfs4_select_rw_stateid(&arg.stateid, state, FMODE_WRITE, - &lockowner); + if (!nfs4_valid_open_stateid(state)) + return -EBADF; + if (nfs4_select_rw_stateid(&arg.stateid, state, FMODE_WRITE, + &lockowner) < 0) + return -EBADF; } else nfs4_stateid_copy(&arg.stateid, &zero_stateid);