diff mbox series

[v2,17/29] open: avoid pointless cred reference count bump

Message ID	20241125-work-cred-v2-17-68b9d38bb5b2@kernel.org
State	New
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0EC91CBEAA; Mon, 25 Nov 2024 14:11:00 +0000 (UTC) From: Christian Brauner <brauner@kernel.org> Date: Mon, 25 Nov 2024 15:10:13 +0100 Subject: [PATCH v2 17/29] open: avoid pointless cred reference count bump Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20241125-work-cred-v2-17-68b9d38bb5b2@kernel.org> References: <20241125-work-cred-v2-0-68b9d38bb5b2@kernel.org> In-Reply-To: <20241125-work-cred-v2-0-68b9d38bb5b2@kernel.org> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: Amir Goldstein <amir73il@gmail.com>, Miklos Szeredi <miklos@szeredi.hu>, Al Viro <viro@zeniv.linux.org.uk>, Jens Axboe <axboe@kernel.dk>, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Christian Brauner <brauner@kernel.org>
Series	cred: rework {override,revert}_creds() \| expand [v2,00/29] cred: rework {override,revert}_creds() [v2,01/29] tree-wide: s/override_creds()/override_creds_light(get_new_cred())/g [v2,02/29] cred: return old creds from revert_creds_light() [v2,03/29] tree-wide: s/revert_creds()/put_cred(revert_creds_light())/g [v2,04/29] cred: remove old {override,revert}_creds() helpers [v2,05/29] tree-wide: s/override_creds_light()/override_creds()/g [v2,06/29] tree-wide: s/revert_creds_light()/revert_creds()/g [v2,07/29] firmware: avoid pointless reference count bump [v2,08/29] sev-dev: avoid pointless cred reference count bump [v2,09/29] target_core_configfs: avoid pointless cred reference count bump [v2,10/29] aio: avoid pointless cred reference count bump [v2,11/29] binfmt_misc: avoid pointless cred reference count bump [v2,12/29] coredump: avoid pointless cred reference count bump [v2,13/29] nfs/localio: avoid pointless cred reference count bumps [v2,14/29] nfs/nfs4idmap: avoid pointless reference count bump [v2,15/29] nfs/nfs4recover: avoid pointless cred reference count bump [v2,16/29] nfsfh: avoid pointless cred reference count bump [v2,17/29] open: avoid pointless cred reference count bump [v2,18/29] ovl: avoid pointless cred reference count bump [v2,19/29] cifs: avoid pointless cred reference count bump [v2,20/29] cifs: avoid pointless cred reference count bump [v2,21/29] smb: avoid pointless cred reference count bump [v2,22/29] io_uring: avoid pointless cred reference count bump [v2,23/29] acct: avoid pointless reference count bump [v2,24/29] cgroup: avoid pointless cred reference count bump [v2,25/29] trace: avoid pointless cred reference count bump [v2,26/29] dns_resolver: avoid pointless cred reference count bump [v2,27/29] cachefiles: avoid pointless cred reference count bump [v2,28/29] nfsd: avoid pointless cred reference count bump [v2,29/29] cred: remove unused get_new_cred()

Commit Message

Christian Brauner Nov. 25, 2024, 2:10 p.m. UTC

The code already got rid of the extra reference count from the old
version of override_creds().

Signed-off-by: Christian Brauner <brauner@kernel.org>
---
 fs/open.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/fs/open.c b/fs/open.c
index 0a5cd8e74fb9bb4cc484d84096c6123b21acbf16..ffcfef67ac864c8ddaf9719cbc2762d5575597f3 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -402,7 +402,6 @@  static bool access_need_override_creds(int flags)
 
 static const struct cred *access_override_creds(void)
 {
-	const struct cred *old_cred;
 	struct cred *override_cred;
 
 	override_cred = prepare_creds();
@@ -447,13 +446,7 @@  static const struct cred *access_override_creds(void)
 	 * freeing.
 	 */
 	override_cred->non_rcu = 1;
-
-	old_cred = override_creds(get_new_cred(override_cred));
-
-	/* override_cred() gets its own ref */
-	put_cred(override_cred);
-
-	return old_cred;
+	return override_creds(override_cred);
 }
 
 static long do_faccessat(int dfd, const char __user *filename, int mode, int flags)