Skip to content

Commit 51c0bcf

Browse files
braunerbrauner
committed
tree-wide: s/revert_creds_light()/revert_creds()/g
Rename all calls to revert_creds_light() back to revert_creds(). 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 6771e00 commit 51c0bcf

File tree

27 files changed

+33
-33
lines changed

27 files changed

+33
-33
lines changed

‎drivers/base/firmware_loader/main.c

+1-1
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-
put_cred(revert_creds_light(old_cred));
946+
put_cred(revert_creds(old_cred));
947947
put_cred(kern_cred);
948948

949949
out:

‎drivers/crypto/ccp/sev-dev.c

+1-1
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-
put_cred(revert_creds_light(old_cred));
252+
put_cred(revert_creds(old_cred));
253253

254254
return fp;
255255
}

‎drivers/target/target_core_configfs.c

+1-1
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(get_new_cred(kern_cred));
37603760
target_init_dbroot();
3761-
put_cred(revert_creds_light(old_cred));
3761+
put_cred(revert_creds(old_cred));
37623762
put_cred(kern_cred);
37633763

37643764
return 0;

‎fs/aio.c

+1-1
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(get_new_cred(iocb->fsync.creds));
16431643

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

‎fs/backing-file.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,
197197
backing_aio_cleanup(aio, ret);
198198
}
199199
out:
200-
revert_creds_light(old_cred);
200+
revert_creds(old_cred);
201201

202202
if (ctx->accessed)
203203
ctx->accessed(iocb->ki_filp);
@@ -264,7 +264,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
264264
backing_aio_cleanup(aio, ret);
265265
}
266266
out:
267-
revert_creds_light(old_cred);
267+
revert_creds(old_cred);
268268

269269
return ret;
270270
}
@@ -283,7 +283,7 @@ ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,
283283

284284
old_cred = override_creds(ctx->cred);
285285
ret = vfs_splice_read(in, &iocb->ki_pos, pipe, len, flags);
286-
revert_creds_light(old_cred);
286+
revert_creds(old_cred);
287287

288288
if (ctx->accessed)
289289
ctx->accessed(iocb->ki_filp);
@@ -314,7 +314,7 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
314314
file_start_write(out);
315315
ret = out->f_op->splice_write(pipe, out, &iocb->ki_pos, len, flags);
316316
file_end_write(out);
317-
revert_creds_light(old_cred);
317+
revert_creds(old_cred);
318318

319319
if (ctx->end_write)
320320
ctx->end_write(iocb, ret);
@@ -340,7 +340,7 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
340340

341341
old_cred = override_creds(ctx->cred);
342342
ret = call_mmap(vma->vm_file, vma);
343-
revert_creds_light(old_cred);
343+
revert_creds(old_cred);
344344

345345
if (ctx->accessed)
346346
ctx->accessed(user_file);

‎fs/binfmt_misc.c

+1-1
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(get_new_cred(file->f_cred));
833833
f = open_exec(e->interpreter);
834-
put_cred(revert_creds_light(old_cred));
834+
put_cred(revert_creds(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

+1-1
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-
put_cred(revert_creds_light(saved_cred));
402+
put_cred(revert_creds(saved_cred));
403403
}
404404

405405
/*

‎fs/coredump.c

+1-1
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-
put_cred(revert_creds_light(old_cred));
784+
put_cred(revert_creds(old_cred));
785785
fail_creds:
786786
put_cred(cred);
787787
fail:

‎fs/nfs/localio.c

+2-2
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-
put_cred(revert_creds_light(save_cred));
387+
put_cred(revert_creds(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-
put_cred(revert_creds_light(save_cred));
561+
put_cred(revert_creds(save_cred));
562562
current->flags = old_flags;
563563
}
564564

‎fs/nfs/nfs4idmap.c

+1-1
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(get_new_cred(id_resolver_cache));
315315
rkey = nfs_idmap_request_key(name, namelen, type, idmap);
316-
put_cred(revert_creds_light(saved_cred));
316+
put_cred(revert_creds(saved_cred));
317317

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

‎fs/nfsd/auth.c

+1-1
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-
put_cred(revert_creds_light(get_cred(current_real_cred())));
30+
put_cred(revert_creds(get_cred(current_real_cred())));
3131
new = prepare_creds();
3232
if (!new)
3333
return -ENOMEM;

‎fs/nfsd/filecache.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ nfsd_file_acquire_local(struct net *net, struct svc_cred *cred,
12481248

12491249
beres = nfsd_file_do_acquire(NULL, net, cred, client,
12501250
fhp, may_flags, NULL, pnf, true);
1251-
put_cred(revert_creds_light(save_cred));
1251+
put_cred(revert_creds(save_cred));
12521252
return beres;
12531253
}
12541254

‎fs/nfsd/nfs4recover.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ nfs4_save_creds(const struct cred **original_creds)
8989
static void
9090
nfs4_reset_creds(const struct cred *original)
9191
{
92-
put_cred(revert_creds_light(original));
92+
put_cred(revert_creds(original));
9393
}
9494

9595
static void

‎fs/open.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ static long do_faccessat(int dfd, const char __user *filename, int mode, int fla
523523
}
524524
out:
525525
if (old_cred)
526-
put_cred(revert_creds_light(old_cred));
526+
put_cred(revert_creds(old_cred));
527527

528528
return res;
529529
}

‎fs/overlayfs/copy_up.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ static int ovl_prep_cu_creds(struct dentry *dentry, struct ovl_cu_creds *cc)
749749
static void ovl_revert_cu_creds(struct ovl_cu_creds *cc)
750750
{
751751
if (cc->new) {
752-
put_cred(revert_creds_light(cc->old));
752+
put_cred(revert_creds(cc->old));
753753
put_cred(cc->new);
754754
}
755755
}

‎fs/overlayfs/dir.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ static const struct cred *ovl_setup_cred_for_create(struct dentry *dentry,
575575
}
576576

577577
/*
578-
* Caller is going to match this with revert_creds_light() and drop
578+
* Caller is going to match this with revert_creds() and drop
579579
* referenec on the returned creds.
580580
* We must be called with creator creds already, otherwise we risk
581581
* leaking creds.

‎fs/overlayfs/util.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const struct cred *ovl_override_creds(struct super_block *sb)
7070

7171
void ovl_revert_creds(const struct cred *old_cred)
7272
{
73-
revert_creds_light(old_cred);
73+
revert_creds(old_cred);
7474
}
7575

7676
/*

‎fs/smb/client/cifs_spnego.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo,
175175
cifs_dbg(FYI, "key description = %s\n", description);
176176
saved_cred = override_creds(get_new_cred(spnego_cred));
177177
spnego_key = request_key(&cifs_spnego_key_type, description, "");
178-
put_cred(revert_creds_light(saved_cred));
178+
put_cred(revert_creds(saved_cred));
179179

180180
#ifdef CONFIG_CIFS_DEBUG2
181181
if (cifsFYI && !IS_ERR(spnego_key)) {

‎fs/smb/client/cifsacl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid)
327327
out_key_put:
328328
key_put(sidkey);
329329
out_revert_creds:
330-
put_cred(revert_creds_light(saved_cred));
330+
put_cred(revert_creds(saved_cred));
331331
return rc;
332332

333333
invalidate_key:
@@ -438,7 +438,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct smb_sid *psid,
438438
out_key_put:
439439
key_put(sidkey);
440440
out_revert_creds:
441-
put_cred(revert_creds_light(saved_cred));
441+
put_cred(revert_creds(saved_cred));
442442
kfree(sidstr);
443443

444444
/*

‎fs/smb/server/smb_common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ void ksmbd_revert_fsids(struct ksmbd_work *work)
800800
WARN_ON(!work->saved_cred);
801801

802802
cred = current_cred();
803-
put_cred(revert_creds_light(work->saved_cred));
803+
put_cred(revert_creds(work->saved_cred));
804804
put_cred(cred);
805805
work->saved_cred = NULL;
806806
}

‎include/linux/cred.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static inline const struct cred *override_creds(const struct cred *override_cred
178178
return old;
179179
}
180180

181-
static inline const struct cred *revert_creds_light(const struct cred *revert_cred)
181+
static inline const struct cred *revert_creds(const struct cred *revert_cred)
182182
{
183183
const struct cred *override_cred = current->cred;
184184

‎io_uring/io_uring.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
17391739
audit_uring_exit(!ret, ret);
17401740

17411741
if (creds)
1742-
put_cred(revert_creds_light(creds));
1742+
put_cred(revert_creds(creds));
17431743

17441744
if (ret == IOU_OK) {
17451745
if (issue_flags & IO_URING_F_COMPLETE_DEFER)

‎io_uring/sqpoll.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, bool cap_entries)
192192
if (to_submit && wq_has_sleeper(&ctx->sqo_sq_wait))
193193
wake_up(&ctx->sqo_sq_wait);
194194
if (creds)
195-
put_cred(revert_creds_light(creds));
195+
put_cred(revert_creds(creds));
196196
}
197197

198198
return ret;

‎kernel/acct.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ static void do_acct_process(struct bsd_acct_struct *acct)
541541
}
542542
out:
543543
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
544-
put_cred(revert_creds_light(orig_cred));
544+
put_cred(revert_creds(orig_cred));
545545
}
546546

547547
/**

‎kernel/cgroup/cgroup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5220,7 +5220,7 @@ static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf,
52205220
ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,
52215221
of->file->f_path.dentry->d_sb,
52225222
threadgroup, ctx->ns);
5223-
put_cred(revert_creds_light(saved_cred));
5223+
put_cred(revert_creds(saved_cred));
52245224
if (ret)
52255225
goto out_finish;
52265226

‎kernel/trace/trace_events_user.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ static int user_event_set_call_visible(struct user_event *user, bool visible)
14761476
else
14771477
ret = trace_remove_event_call(&user->call);
14781478

1479-
put_cred(revert_creds_light(old_cred));
1479+
put_cred(revert_creds(old_cred));
14801480
put_cred(cred);
14811481

14821482
return ret;

‎net/dns_resolver/dns_query.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ int dns_query(struct net *net,
126126
*/
127127
saved_cred = override_creds(get_new_cred(dns_resolver_cache));
128128
rkey = request_key_net(&key_type_dns_resolver, desc, net, options);
129-
put_cred(revert_creds_light(saved_cred));
129+
put_cred(revert_creds(saved_cred));
130130
kfree(desc);
131131
if (IS_ERR(rkey)) {
132132
ret = PTR_ERR(rkey);

0 commit comments

Comments
 (0)