Skip to content

Commit 62e5396

Browse files
committed
smb: avoid pointless cred reference count bump
The creds are allocated via prepare_kernel_cred() which has already taken a reference. This also removes a pointless check that gives the impression that override_creds() can ever be called on a task with current->cred NULL. That's not possible afaict. Remove the check to not imply that there can be a dangling pointer in current->cred. Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Jeff Layton <[email protected]> Reviewed-by: Jens Axboe <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 2b315ed commit 62e5396

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

fs/smb/server/smb_common.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -780,11 +780,7 @@ int __ksmbd_override_fsids(struct ksmbd_work *work,
780780
cred->cap_effective = cap_drop_fs_set(cred->cap_effective);
781781

782782
WARN_ON(work->saved_cred);
783-
work->saved_cred = override_creds(get_new_cred(cred));
784-
if (!work->saved_cred) {
785-
abort_creds(cred);
786-
return -EINVAL;
787-
}
783+
work->saved_cred = override_creds(cred);
788784
return 0;
789785
}
790786

@@ -796,13 +792,11 @@ int ksmbd_override_fsids(struct ksmbd_work *work)
796792
void ksmbd_revert_fsids(struct ksmbd_work *work)
797793
{
798794
const struct cred *cred;
799-
800795
WARN_ON(!work->saved_cred);
801796

802-
cred = current_cred();
803-
put_cred(revert_creds(work->saved_cred));
804-
put_cred(cred);
797+
cred = revert_creds(work->saved_cred);
805798
work->saved_cred = NULL;
799+
put_cred(cred);
806800
}
807801

808802
__le32 smb_map_generic_desired_access(__le32 daccess)

0 commit comments

Comments
 (0)