Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp700263ybz; Wed, 15 Apr 2020 17:01:53 -0700 (PDT) X-Google-Smtp-Source: APiQypJW6WJ77zs0vQxNrP47/jyBEiGR9lOsGEuFRxQJODTQQUD0Io2ajrf1jg3NCdQXN1ep9LoT X-Received: by 2002:a05:6402:31b9:: with SMTP id dj25mr27093133edb.284.1586995312876; Wed, 15 Apr 2020 17:01:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586995312; cv=none; d=google.com; s=arc-20160816; b=a+KkUaI4FP5t1IY9wr9PLZeTiZ0/rwlDM7S+sM+BhikwRfnZxLJg60fekz+hFY3LrR cRmS2g5B1mFbXHpYSGe2LvcNblUsROf9XmRvnFrYb8q4gaUKa25Vdm5SGosASHd2lHvJ cyJHR25UM6gptcDwbSD5c1YqxIug6vLRoaF3z/8VuVl1K8lxPgVF3Nh4MhMvpb/XahDm HKUWJs9RPzO5Dz03+YcUFJx7OGnWqgWNEpVP3dW4vgKoQp1Ig0mpk7aLmLwKsu6sW9i6 DgH0tsK5Ld9jUeldW5XVelSSJeMEoz8zCKVs3s27a/1uLtJLcApVO/9LeP/gAos+XNJe twng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qg+QN1k9dH+CvcCelxJlkXgLCOufAOos9Pwi56ecabE=; b=ci1RS1a08Jc9eqKERc5qONrEvzL7F0RFF9RohJz8ZnBHN0heBNKyVDBdQg8trDke+j G/RFYscqtmXEJs+Jy6wDZpiHweHVWMDSD84YPGSA0hw3goIeMHwuNRiks/5qRAWoLDwR qGWvpcf8f4vTdZkMcgkFzSwwKd5sevjEHlae2mCwBlPoNDCnyVS3tw7TkG/dBvJw2Hsy 4OEcYiB7pD8uX8CMPU9rdJNi8+cxWiNazIM9FUgHmXKbwhwyL/tebtKHdLF0wE/BD87C N4ULIboAfYgFrmevgNdhyd2QQ94b41WQss9BfImkmnnSoMt+CHT8t/RYUKiTVQkd7XTb jMKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KxW4A6k8; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p31si10415454edb.495.2020.04.15.17.01.28; Wed, 15 Apr 2020 17:01:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KxW4A6k8; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S370670AbgDONNl (ORCPT + 99 others); Wed, 15 Apr 2020 09:13:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:55014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897049AbgDOLfZ (ORCPT ); Wed, 15 Apr 2020 07:35:25 -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 A02AE20737; Wed, 15 Apr 2020 11:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586950525; bh=FtXTfofnjxnh+C0trmA6BpW36cW+yD3+qYSHdl9Ug4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KxW4A6k8wrrZ3JErvUi5HdHPMuvtpGUv6wrHvOIIAj6N0T4eCKYvgRx6qLZ+Ig4Xf A1odxLHabbXq7kpgE6mkGflz+9H3EYiqyPferC5xkHy5MlLwlzg+5aBH1WBAB2u4k4 Ukr7U9U3YinEYzkyzEkvw97KOP2zYm1THDJecM4U= 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.6 034/129] NFS: alloc_nfs_open_context() must use the file cred when available Date: Wed, 15 Apr 2020 07:33:09 -0400 Message-Id: <20200415113445.11881-34-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415113445.11881-1-sashal@kernel.org> References: <20200415113445.11881-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 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 11bf15800ac99..a10fb87c6ac33 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