Skip to content

Commit f41799b

Browse files
committed
nfs: use credential guards in nfs_idmap_get_key()
Use credential guards for scoped credential override with automatic restoration on scope exit. Link: https://patch.msgid.link/20251103-work-creds-guards-simple-v1-12-a3e156839e7f@kernel.org Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent bff3c84 commit f41799b

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

fs/nfs/nfs4idmap.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,15 +306,12 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen,
306306
const char *type, void *data,
307307
size_t data_size, struct idmap *idmap)
308308
{
309-
const struct cred *saved_cred;
310309
struct key *rkey;
311310
const struct user_key_payload *payload;
312311
ssize_t ret;
313312

314-
saved_cred = override_creds(id_resolver_cache);
315-
rkey = nfs_idmap_request_key(name, namelen, type, idmap);
316-
revert_creds(saved_cred);
317-
313+
scoped_with_creds(id_resolver_cache)
314+
rkey = nfs_idmap_request_key(name, namelen, type, idmap);
318315
if (IS_ERR(rkey)) {
319316
ret = PTR_ERR(rkey);
320317
goto out;

0 commit comments

Comments
 (0)