From patchwork Wed Mar 5 18:30:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 3778391 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 681D59F35F for ; Wed, 5 Mar 2014 18:30:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E9A12020F for ; Wed, 5 Mar 2014 18:30:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A678C20219 for ; Wed, 5 Mar 2014 18:30:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752970AbaCESaW (ORCPT ); Wed, 5 Mar 2014 13:30:22 -0500 Received: from mail-ie0-f169.google.com ([209.85.223.169]:63674 "EHLO mail-ie0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756509AbaCESaV (ORCPT ); Wed, 5 Mar 2014 13:30:21 -0500 Received: by mail-ie0-f169.google.com with SMTP id to1so1509635ieb.28 for ; Wed, 05 Mar 2014 10:30:21 -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=MMbJQLS74ZFtpw/ybP08CwH4S5TyNgQ8iewFYjkQzD8=; b=DUR8SdLeZqp0lKkZYPP6R23OcTUpeAe61WxGs/YXnEUef0g6Z5Bqs82JO2JU9K83dv 0YWVLzW1/qz0cJ6z7Niu+pHjxxckZguwi75IdONK4v2M7W/bKPvQxWbKdWOcBwTL2m98 8FboBpQjRP4/aQvTUaSmXEvsrbRXkI8A7PJ3hmXXcX4aoBFQHk3lQBueJ7dSbHI2fjK8 m/5D28gSgVHtb/eJC7HY05Eat0ylPGJ/pKWDKNt2cJXhPLeiIISKzDH5j8w+Y072Sj92 vqdfZPQk3ZP+QCcupGymVnpnKGmL+xH1E8R9jgk86N7KnGVkpA0XnHCUkBj2QVW0qUy/ HYZA== X-Gm-Message-State: ALoCoQmZZze/z/bJjcBHummNO1C6ZMsVXE6beCH+ISVADr3+LR1RYlAqu7ZJ7AF0rWBzYYIu4jd9 X-Received: by 10.50.222.202 with SMTP id qo10mr37008424igc.13.1394044221010; Wed, 05 Mar 2014 10:30:21 -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 gd5sm15729716igd.5.2014.03.05.10.30.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Mar 2014 10:30:20 -0800 (PST) From: Trond Myklebust To: Andy Adamson Cc: linux-nfs@vger.kernel.org Subject: [PATCH v4 4/4] NFSv4: Fail the truncate() if the lock/open stateid is invalid Date: Wed, 5 Mar 2014 13:30:11 -0500 Message-Id: <1394044211-22302-5-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394044211-22302-4-git-send-email-trond.myklebust@primarydata.com> References: <1394028452-15956-1-git-send-email-trond.myklebust@primarydata.com> <1394044211-22302-1-git-send-email-trond.myklebust@primarydata.com> <1394044211-22302-2-git-send-email-trond.myklebust@primarydata.com> <1394044211-22302-3-git-send-email-trond.myklebust@primarydata.com> <1394044211-22302-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 4ae8141452c9..450bfedbe2f4 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) == -EIO) + return -EBADF; } else nfs4_stateid_copy(&arg.stateid, &zero_stateid);