[PATCH 13/16] smb: use credential guards in cifs_get_spnego_key()
From: Christian Brauner <brauner@kernel.org>
Date: 2025-11-03 11:27:46
Also in:
cgroups, linux-cifs, linux-fsdevel, linux-nfs, linux-unionfs, lkml
Subsystem:
common internet file system client (cifs and smb3), filesystems (vfs and infrastructure), the rest · Maintainers:
Steve French, Alexander Viro, Christian Brauner, Linus Torvalds
Use credential guards for scoped credential override with automatic restoration on scope exit. Signed-off-by: Christian Brauner <brauner@kernel.org> --- fs/smb/client/cifs_spnego.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/smb/client/cifs_spnego.c b/fs/smb/client/cifs_spnego.c
index 9891f55bac1e..da935bd1ce87 100644
--- a/fs/smb/client/cifs_spnego.c
+++ b/fs/smb/client/cifs_spnego.c@@ -90,7 +90,6 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo, size_t desc_len; struct key *spnego_key; const char *hostname = server->hostname; - const struct cred *saved_cred; /* length of fields (with semicolons): ver=0xyz ip4=ipaddress host=hostname sec=mechanism uid=0xFF user=username */
@@ -158,9 +157,8 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo, dp += sprintf(dp, ";upcall_target=app"); cifs_dbg(FYI, "key description = %s\n", description); - saved_cred = override_creds(spnego_cred); - spnego_key = request_key(&cifs_spnego_key_type, description, ""); - revert_creds(saved_cred); + scoped_with_creds(spnego_cred) + spnego_key = request_key(&cifs_spnego_key_type, description, ""); #ifdef CONFIG_CIFS_DEBUG2 if (cifsFYI && !IS_ERR(spnego_key)) {
--
2.47.3