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 9D10FC3815B for ; Wed, 15 Apr 2020 12:49:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F96B206A2 for ; Wed, 15 Apr 2020 12:49:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586954947; bh=DVx1iM5DB2AgwvTG9N7Bdjs7X86TVf8/EWYtpAqWjzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b4g8KrbuFKMaqUrWRvReh0bFlVVpt/odGZTOmw+FwgZ2cfDgKRWaEqV1IuubjHZjC 39dG8flIRzqMe2LFXvyX6LqTnlqXJ9itRg0pIoqttrObhaF34BtySAusz+3vTqRucF bVBYVLw/ihODVVQh6Gq7rPc9XhU7vQqYl2VXJLY8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S370322AbgDOMtC (ORCPT ); Wed, 15 Apr 2020 08:49:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:34162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408936AbgDOLm6 (ORCPT ); Wed, 15 Apr 2020 07:42:58 -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 709682137B; Wed, 15 Apr 2020 11:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586950978; bh=DVx1iM5DB2AgwvTG9N7Bdjs7X86TVf8/EWYtpAqWjzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2X5Tbd3ALEL5gmONPpMuBxL+HW1oFwIIbXOdhV/oec7U7G/n5kJywcDxo/kD7laDD XuURi37zp+6aOUNmCaF3cYmq8DgGBy4dYuZtoNGMlXcDzh+mwoAVDBLEaxl77CZB2Y 98zjXC2bTka1l7C3QV0rveUoVAKU3qOZ0aFMRiCY= 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 5.5 026/106] NFS: alloc_nfs_open_context() must use the file cred when available Date: Wed, 15 Apr 2020 07:41:06 -0400 Message-Id: <20200415114226.13103-26-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415114226.13103-1-sashal@kernel.org> References: <20200415114226.13103-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Trond Myklebust [ Upstream commit 1d179d6bd67369a52edea8562154b31ee20be1cc ] If we're creating a nfs_open_context() for a specific file pointer, we must use the cred assigned to that file. Fixes: a52458b48af1 ("NFS/NFSD/SUNRPC: replace generic creds with 'struct cred'.") Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/inode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index b0b4b9f303fd8..6a360ba43285e 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -959,16 +959,16 @@ struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, struct file *filp) { struct nfs_open_context *ctx; - const struct cred *cred = get_current_cred(); ctx = kmalloc(sizeof(*ctx), GFP_KERNEL); - if (!ctx) { - put_cred(cred); + if (!ctx) return ERR_PTR(-ENOMEM); - } nfs_sb_active(dentry->d_sb); ctx->dentry = dget(dentry); - ctx->cred = cred; + if (filp) + ctx->cred = get_cred(filp->f_cred); + else + ctx->cred = get_current_cred(); ctx->ll_cred = NULL; ctx->state = NULL; ctx->mode = f_mode; -- 2.20.1