From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88134C2BB55 for ; Wed, 15 Apr 2020 11:59:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FB5B20575 for ; Wed, 15 Apr 2020 11:59:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586951996; bh=lhqfP405oEtk3CK13a06umKcE0HjlgIDENH9HusRDLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pkqEeWupm0ok90IajDQcbsR4mfD1KFO4tzxCQjut9Ld31pee4CnaDZihWRPsCu1NS KVXHHMLUisxFk5gm3qXWuYCMmwPKs4ykWjMX89RZl1pnWIoHllrr/lD7Vc6I9hN7Rc 8PxV19tVoeXT40fnnJC+Cwc5Hjwc21LMqA+MKlhI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S368062AbgDOL7x (ORCPT ); Wed, 15 Apr 2020 07:59:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:42638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897614AbgDOLrT (ORCPT ); Wed, 15 Apr 2020 07:47:19 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5417821582; Wed, 15 Apr 2020 11:47:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586951238; bh=lhqfP405oEtk3CK13a06umKcE0HjlgIDENH9HusRDLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dTAku19OkoYlKcMu0NYEkDP2ItyuR3atl+6hzuNPDBULfPattQJh/UdGLXHRN4Uad sUIEM8qSu5N1X6CwUeH+95YU6LRL8aD/rabIcTYY9NKvku8Q/xZ9EhWF/P6POmJzSe A5fFh+0+NoP/rRbP8ibGttQ1LteQ+vuoef7gDB8M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 06/30] NFSv4/pnfs: Return valid stateids in nfs_layout_find_inode_by_stateid() Date: Wed, 15 Apr 2020 07:46:47 -0400 Message-Id: <20200415114711.15381-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415114711.15381-1-sashal@kernel.org> References: <20200415114711.15381-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust [ Upstream commit d911c57a19551c6bef116a3b55c6b089901aacb0 ] Make sure to test the stateid for validity so that we catch instances where the server may have been reusing stateids in nfs_layout_find_inode_by_stateid(). Fixes: 7b410d9ce460 ("pNFS: Delay getting the layout header in CB_LAYOUTRECALL handlers") Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/callback_proc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index b8d55da2f04d5..440ff8e7082b6 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -127,6 +127,8 @@ static struct inode *nfs_layout_find_inode_by_stateid(struct nfs_client *clp, restart: list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) { list_for_each_entry(lo, &server->layouts, plh_layouts) { + if (!pnfs_layout_is_valid(lo)) + continue; if (stateid != NULL && !nfs4_stateid_match_other(stateid, &lo->plh_stateid)) continue; -- 2.20.1