diff mbox series

[21/26] smb: avoid pointless cred reference count bump

Message ID	20241124-work-cred-v1-21-f352241c3970@kernel.org (mailing list archive)
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 C7D1920D4E8; Sun, 24 Nov 2024 13:44:59 +0000 (UTC) From: Christian Brauner <brauner@kernel.org> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: Christian Brauner <brauner@kernel.org>, Amir Goldstein <amir73il@gmail.com>, Miklos Szeredi <miklos@szeredi.hu>, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 21/26] smb: avoid pointless cred reference count bump Date: Sun, 24 Nov 2024 14:44:07 +0100 Message-ID: <20241124-work-cred-v1-21-f352241c3970@kernel.org> In-Reply-To: <20241124-work-cred-v1-0-f352241c3970@kernel.org> References: <20241124-work-cred-v1-0-f352241c3970@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit
Series	[01/26] tree-wide: s/override_creds()/override_creds_light(get_new_cred())/g \| expand [01/26] tree-wide: s/override_creds()/override_creds_light(get_new_cred())/g [02/26] cred: return old creds from revert_creds_light() [03/26] tree-wide: s/revert_creds()/put_cred(revert_creds_light())/g [04/26] cred: remove old {override,revert}_creds() helpers [05/26] tree-wide: s/override_creds_light()/override_creds()/g [06/26] tree-wide: s/revert_creds_light()/revert_creds()/g [07/26] firmware: avoid pointless reference count bump [08/26] sev-dev: avoid pointless cred reference count bump [09/26] target_core_configfs: avoid pointless cred reference count bump [10/26] aio: avoid pointless cred reference count bump [11/26] binfmt_misc: avoid pointless cred reference count bump [12/26] coredump: avoid pointless cred reference count bump [13/26] nfs/localio: avoid pointless cred reference count bumps [14/26] nfs/nfs4idmap: avoid pointless reference count bump [15/26] nfs/nfs4recover: avoid pointless cred reference count bump [16/26] nfsfh: avoid pointless cred reference count bump [17/26] open: avoid pointless cred reference count bump [18/26] ovl: avoid pointless cred reference count bump [19/26] cifs: avoid pointless cred reference count bump [20/26] cifs: avoid pointless cred reference count bump [21/26] smb: avoid pointless cred reference count bump [22/26] io_uring: avoid pointless cred reference count bump [23/26] acct: avoid pointless reference count bump [24/26] cgroup: avoid pointless cred reference count bump [25/26] trace: avoid pointless cred reference count bump [26/26] dns_resolver: avoid pointless cred reference count bump

Commit Message

Christian Brauner Nov. 24, 2024, 1:44 p.m. UTC

No need for the extra reference count bump.

Signed-off-by: Christian Brauner <brauner@kernel.org>
---
 fs/smb/server/smb_common.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Al Viro Nov. 24, 2024, 6:37 p.m. UTC | #1

On Sun, Nov 24, 2024 at 02:44:07PM +0100, Christian Brauner wrote:
> No need for the extra reference count bump.
> 
> Signed-off-by: Christian Brauner <brauner@kernel.org>
> ---
>  fs/smb/server/smb_common.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
> index f1d770a214c8b2c7d7dd4083ef57c7130bbce52c..a3f96804f84f03c22376769dffdf60cd66f5e3d2 100644
> --- a/fs/smb/server/smb_common.c
> +++ b/fs/smb/server/smb_common.c
> @@ -780,7 +780,7 @@ int __ksmbd_override_fsids(struct ksmbd_work *work,
>  		cred->cap_effective = cap_drop_fs_set(cred->cap_effective);
>  
>  	WARN_ON(work->saved_cred);
> -	work->saved_cred = override_creds(get_new_cred(cred));
> +	work->saved_cred = override_creds(cred);
>  	if (!work->saved_cred) {
>  		abort_creds(cred);
>  		return -EINVAL;

Won't that leave a dangling pointer?

diff mbox series

Patch

diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
index f1d770a214c8b2c7d7dd4083ef57c7130bbce52c..a3f96804f84f03c22376769dffdf60cd66f5e3d2 100644
--- a/fs/smb/server/smb_common.c
+++ b/fs/smb/server/smb_common.c
@@ -780,7 +780,7 @@  int __ksmbd_override_fsids(struct ksmbd_work *work,
 		cred->cap_effective = cap_drop_fs_set(cred->cap_effective);
 
 	WARN_ON(work->saved_cred);
-	work->saved_cred = override_creds(get_new_cred(cred));
+	work->saved_cred = override_creds(cred);
 	if (!work->saved_cred) {
 		abort_creds(cred);
 		return -EINVAL;
@@ -799,9 +799,7 @@  void ksmbd_revert_fsids(struct ksmbd_work *work)
 
 	WARN_ON(!work->saved_cred);
 
-	cred = current_cred();
 	put_cred(revert_creds(work->saved_cred));
-	put_cred(cred);
 	work->saved_cred = NULL;
 }