Skip to content

Commit f905e00

Browse files
committed
tree-wide: s/revert_creds()/put_cred(revert_creds_light())/g
Convert all calls to revert_creds() over to explicitly dropping reference counts in preparation for converting revert_creds() to revert_creds_light() semantics. 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 95c54bc commit f905e00

File tree

23 files changed

+25
-25
lines changed

23 files changed

+25
-25
lines changed

drivers/base/firmware_loader/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
943943
} else
944944
ret = assign_fw(fw, device);
945945

946-
revert_creds(old_cred);
946+
put_cred(revert_creds_light(old_cred));
947947
put_cred(kern_cred);
948948

949949
out:

drivers/crypto/ccp/sev-dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static struct file *open_file_as_root(const char *filename, int flags, umode_t m
249249
fp = file_open_root(&root, filename, flags, mode);
250250
path_put(&root);
251251

252-
revert_creds(old_cred);
252+
put_cred(revert_creds_light(old_cred));
253253

254254
return fp;
255255
}

drivers/target/target_core_configfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3758,7 +3758,7 @@ static int __init target_core_init_configfs(void)
37583758
}
37593759
old_cred = override_creds_light(get_new_cred(kern_cred));
37603760
target_init_dbroot();
3761-
revert_creds(old_cred);
3761+
put_cred(revert_creds_light(old_cred));
37623762
put_cred(kern_cred);
37633763

37643764
return 0;

fs/aio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,7 @@ static void aio_fsync_work(struct work_struct *work)
16421642
const struct cred *old_cred = override_creds_light(get_new_cred(iocb->fsync.creds));
16431643

16441644
iocb->ki_res.res = vfs_fsync(iocb->fsync.file, iocb->fsync.datasync);
1645-
revert_creds(old_cred);
1645+
put_cred(revert_creds_light(old_cred));
16461646
put_cred(iocb->fsync.creds);
16471647
iocb_put(iocb);
16481648
}

fs/binfmt_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
831831
*/
832832
old_cred = override_creds_light(get_new_cred(file->f_cred));
833833
f = open_exec(e->interpreter);
834-
revert_creds(old_cred);
834+
put_cred(revert_creds_light(old_cred));
835835
if (IS_ERR(f)) {
836836
pr_notice("register: failed to install interpreter file %s\n",
837837
e->interpreter);

fs/cachefiles/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ static inline void cachefiles_begin_secure(struct cachefiles_cache *cache,
399399
static inline void cachefiles_end_secure(struct cachefiles_cache *cache,
400400
const struct cred *saved_cred)
401401
{
402-
revert_creds(saved_cred);
402+
put_cred(revert_creds_light(saved_cred));
403403
}
404404

405405
/*

fs/coredump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ void do_coredump(const kernel_siginfo_t *siginfo)
781781
kfree(argv);
782782
kfree(cn.corename);
783783
coredump_finish(core_dumped);
784-
revert_creds(old_cred);
784+
put_cred(revert_creds_light(old_cred));
785785
fail_creds:
786786
put_cred(cred);
787787
fail:

fs/nfs/localio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ static void nfs_local_call_read(struct work_struct *work)
384384
nfs_local_read_done(iocb, status);
385385
nfs_local_pgio_release(iocb);
386386

387-
revert_creds(save_cred);
387+
put_cred(revert_creds_light(save_cred));
388388
}
389389

390390
static int
@@ -558,7 +558,7 @@ static void nfs_local_call_write(struct work_struct *work)
558558
nfs_local_vfs_getattr(iocb);
559559
nfs_local_pgio_release(iocb);
560560

561-
revert_creds(save_cred);
561+
put_cred(revert_creds_light(save_cred));
562562
current->flags = old_flags;
563563
}
564564

fs/nfs/nfs4idmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen,
313313

314314
saved_cred = override_creds_light(get_new_cred(id_resolver_cache));
315315
rkey = nfs_idmap_request_key(name, namelen, type, idmap);
316-
revert_creds(saved_cred);
316+
put_cred(revert_creds_light(saved_cred));
317317

318318
if (IS_ERR(rkey)) {
319319
ret = PTR_ERR(rkey);

fs/nfsd/auth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ int nfsd_setuser(struct svc_cred *cred, struct svc_export *exp)
2727
int flags = nfsexp_flags(cred, exp);
2828

2929
/* discard any old override before preparing the new set */
30-
revert_creds(get_cred(current_real_cred()));
30+
put_cred(revert_creds_light(get_cred(current_real_cred())));
3131
new = prepare_creds();
3232
if (!new)
3333
return -ENOMEM;

0 commit comments

Comments
 (0)