From: Christian Brauner Date: Mon, 25 Nov 2024 14:10:13 +0000 (+0100) Subject: open: avoid pointless cred reference count bump X-Git-Tag: v6.14-rc1~214^2~1^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7708f3a7d25f5f1e80a5ef6abc3abde00128f88c;p=thirdparty%2Flinux.git open: avoid pointless cred reference count bump The code already got rid of the extra reference count from the old version of override_creds(). Link: https://lore.kernel.org/r/20241125-work-cred-v2-17-68b9d38bb5b2@kernel.org Reviewed-by: Jeff Layton Reviewed-by: Jens Axboe Signed-off-by: Christian Brauner --- diff --git a/fs/open.c b/fs/open.c index 0a5cd8e74fb9b..ffcfef67ac864 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)