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 56668C3B1A9 for ; Fri, 14 Feb 2020 17:18:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27984206CC for ; Fri, 14 Feb 2020 17:18:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581700690; bh=vayz16vT2UHLQizRyw4oAKOP8Eg1v2aDo2dAS8xDM94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=W5NgFJcvZpugXsuMeAzra1NFuDnh0aaCPBq7rQ1bu57fpFXeEM/EykqLmbeMQv/bR bQ3GiO+r+IEkbgrnWHeGy5EbAYENATrlhr0UlebbHBHMPB2HFh5iYgwT3e0hnInaMT 0U0eXAYOT8B39zidVTASoPATVOLiHg3vqtokE3T8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389703AbgBNRRh (ORCPT ); Fri, 14 Feb 2020 12:17:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:37866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391480AbgBNQLR (ORCPT ); Fri, 14 Feb 2020 11:11:17 -0500 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 DC5CD2467C; Fri, 14 Feb 2020 16:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696676; bh=vayz16vT2UHLQizRyw4oAKOP8Eg1v2aDo2dAS8xDM94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ef2kYm/Ioqo2xl8aaz8QFjp9UXIwsrdEqG7GlkwBZ6t0EYLwqo3292qkfxEnbKsSL 3WNX3vVzyhUSib1fXYTudUZ3xy6CAD+w11U+58B1qcd6/pR7IiNY0koJMnEAL6BKbG fKVNvpc4B6IOnasG721iWu9hIX2XN6AfA3UCYy3g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trond Myklebust , Trond Myklebust , Anna Schumaker , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 445/459] NFSv4: pnfs_roc() must use cred_fscmp() to compare creds Date: Fri, 14 Feb 2020 11:01:35 -0500 Message-Id: <20200214160149.11681-445-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214160149.11681-1-sashal@kernel.org> References: <20200214160149.11681-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust [ Upstream commit 387122478775be5d9816c34aa29de53d0b926835 ] When comparing two 'struct cred' for equality w.r.t. behaviour under filesystem access, we need to use cred_fscmp(). Fixes: a52458b48af1 ("NFS/NFSD/SUNRPC: replace generic creds with 'struct cred'.") Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/pnfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index bb80034a76619..443639cbb0cfc 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1425,7 +1425,7 @@ bool pnfs_roc(struct inode *ino, /* lo ref dropped in pnfs_roc_release() */ layoutreturn = pnfs_prepare_layoutreturn(lo, &stateid, &iomode); /* If the creds don't match, we can't compound the layoutreturn */ - if (!layoutreturn || cred != lo->plh_lc_cred) + if (!layoutreturn || cred_fscmp(cred, lo->plh_lc_cred) != 0) goto out_noroc; roc = layoutreturn; -- 2.20.1