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/20241125-work-cred-v2-6-68b9d38bb5b2@kernel.org
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2024-11-25 15:10:02 +01:00
parent 6771e004b4
commit 51c0bcf097
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
27 changed files with 33 additions and 33 deletions

View File

@ -943,7 +943,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
} else } else
ret = assign_fw(fw, device); ret = assign_fw(fw, device);
put_cred(revert_creds_light(old_cred)); put_cred(revert_creds(old_cred));
put_cred(kern_cred); put_cred(kern_cred);
out: out:

View File

@ -249,7 +249,7 @@ static struct file *open_file_as_root(const char *filename, int flags, umode_t m
fp = file_open_root(&root, filename, flags, mode); fp = file_open_root(&root, filename, flags, mode);
path_put(&root); path_put(&root);
put_cred(revert_creds_light(old_cred)); put_cred(revert_creds(old_cred));
return fp; return fp;
} }

View File

@ -3758,7 +3758,7 @@ static int __init target_core_init_configfs(void)
} }
old_cred = override_creds(get_new_cred(kern_cred)); old_cred = override_creds(get_new_cred(kern_cred));
target_init_dbroot(); target_init_dbroot();
put_cred(revert_creds_light(old_cred)); put_cred(revert_creds(old_cred));
put_cred(kern_cred); put_cred(kern_cred);
return 0; return 0;

View File

@ -1642,7 +1642,7 @@ static void aio_fsync_work(struct work_struct *work)
const struct cred *old_cred = override_creds(get_new_cred(iocb->fsync.creds)); const struct cred *old_cred = override_creds(get_new_cred(iocb->fsync.creds));
iocb->ki_res.res = vfs_fsync(iocb->fsync.file, iocb->fsync.datasync); iocb->ki_res.res = vfs_fsync(iocb->fsync.file, iocb->fsync.datasync);
put_cred(revert_creds_light(old_cred)); put_cred(revert_creds(old_cred));
put_cred(iocb->fsync.creds); put_cred(iocb->fsync.creds);
iocb_put(iocb); iocb_put(iocb);
} }

View File

@ -197,7 +197,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,
backing_aio_cleanup(aio, ret); backing_aio_cleanup(aio, ret);
} }
out: out:
revert_creds_light(old_cred); revert_creds(old_cred);
if (ctx->accessed) if (ctx->accessed)
ctx->accessed(iocb->ki_filp); ctx->accessed(iocb->ki_filp);
@ -264,7 +264,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
backing_aio_cleanup(aio, ret); backing_aio_cleanup(aio, ret);
} }
out: out:
revert_creds_light(old_cred); revert_creds(old_cred);
return ret; return ret;
} }
@ -283,7 +283,7 @@ ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,
old_cred = override_creds(ctx->cred); old_cred = override_creds(ctx->cred);
ret = vfs_splice_read(in, &iocb->ki_pos, pipe, len, flags); ret = vfs_splice_read(in, &iocb->ki_pos, pipe, len, flags);
revert_creds_light(old_cred); revert_creds(old_cred);
if (ctx->accessed) if (ctx->accessed)
ctx->accessed(iocb->ki_filp); ctx->accessed(iocb->ki_filp);
@ -314,7 +314,7 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
file_start_write(out); file_start_write(out);
ret = out->f_op->splice_write(pipe, out, &iocb->ki_pos, len, flags); ret = out->f_op->splice_write(pipe, out, &iocb->ki_pos, len, flags);
file_end_write(out); file_end_write(out);
revert_creds_light(old_cred); revert_creds(old_cred);
if (ctx->end_write) if (ctx->end_write)
ctx->end_write(iocb, ret); ctx->end_write(iocb, ret);
@ -340,7 +340,7 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
old_cred = override_creds(ctx->cred); old_cred = override_creds(ctx->cred);
ret = call_mmap(vma->vm_file, vma); ret = call_mmap(vma->vm_file, vma);
revert_creds_light(old_cred); revert_creds(old_cred);
if (ctx->accessed) if (ctx->accessed)
ctx->accessed(user_file); ctx->accessed(user_file);

View File

@ -831,7 +831,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
*/ */
old_cred = override_creds(get_new_cred(file->f_cred)); old_cred = override_creds(get_new_cred(file->f_cred));
f = open_exec(e->interpreter); f = open_exec(e->interpreter);
put_cred(revert_creds_light(old_cred)); put_cred(revert_creds(old_cred));
if (IS_ERR(f)) { if (IS_ERR(f)) {
pr_notice("register: failed to install interpreter file %s\n", pr_notice("register: failed to install interpreter file %s\n",
e->interpreter); e->interpreter);

View File

@ -399,7 +399,7 @@ static inline void cachefiles_begin_secure(struct cachefiles_cache *cache,
static inline void cachefiles_end_secure(struct cachefiles_cache *cache, static inline void cachefiles_end_secure(struct cachefiles_cache *cache,
const struct cred *saved_cred) const struct cred *saved_cred)
{ {
put_cred(revert_creds_light(saved_cred)); put_cred(revert_creds(saved_cred));
} }
/* /*

View File

@ -781,7 +781,7 @@ fail_unlock:
kfree(argv); kfree(argv);
kfree(cn.corename); kfree(cn.corename);
coredump_finish(core_dumped); coredump_finish(core_dumped);
put_cred(revert_creds_light(old_cred)); put_cred(revert_creds(old_cred));
fail_creds: fail_creds:
put_cred(cred); put_cred(cred);
fail: fail:

View File

@ -384,7 +384,7 @@ static void nfs_local_call_read(struct work_struct *work)
nfs_local_read_done(iocb, status); nfs_local_read_done(iocb, status);
nfs_local_pgio_release(iocb); nfs_local_pgio_release(iocb);
put_cred(revert_creds_light(save_cred)); put_cred(revert_creds(save_cred));
} }
static int static int
@ -558,7 +558,7 @@ static void nfs_local_call_write(struct work_struct *work)
nfs_local_vfs_getattr(iocb); nfs_local_vfs_getattr(iocb);
nfs_local_pgio_release(iocb); nfs_local_pgio_release(iocb);
put_cred(revert_creds_light(save_cred)); put_cred(revert_creds(save_cred));
current->flags = old_flags; current->flags = old_flags;
} }

View File

@ -313,7 +313,7 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen,
saved_cred = override_creds(get_new_cred(id_resolver_cache)); saved_cred = override_creds(get_new_cred(id_resolver_cache));
rkey = nfs_idmap_request_key(name, namelen, type, idmap); rkey = nfs_idmap_request_key(name, namelen, type, idmap);
put_cred(revert_creds_light(saved_cred)); put_cred(revert_creds(saved_cred));
if (IS_ERR(rkey)) { if (IS_ERR(rkey)) {
ret = PTR_ERR(rkey); ret = PTR_ERR(rkey);

View File

@ -27,7 +27,7 @@ int nfsd_setuser(struct svc_cred *cred, struct svc_export *exp)
int flags = nfsexp_flags(cred, exp); int flags = nfsexp_flags(cred, exp);
/* discard any old override before preparing the new set */ /* discard any old override before preparing the new set */
put_cred(revert_creds_light(get_cred(current_real_cred()))); put_cred(revert_creds(get_cred(current_real_cred())));
new = prepare_creds(); new = prepare_creds();
if (!new) if (!new)
return -ENOMEM; return -ENOMEM;

View File

@ -1248,7 +1248,7 @@ nfsd_file_acquire_local(struct net *net, struct svc_cred *cred,
beres = nfsd_file_do_acquire(NULL, net, cred, client, beres = nfsd_file_do_acquire(NULL, net, cred, client,
fhp, may_flags, NULL, pnf, true); fhp, may_flags, NULL, pnf, true);
put_cred(revert_creds_light(save_cred)); put_cred(revert_creds(save_cred));
return beres; return beres;
} }

View File

@ -89,7 +89,7 @@ nfs4_save_creds(const struct cred **original_creds)
static void static void
nfs4_reset_creds(const struct cred *original) nfs4_reset_creds(const struct cred *original)
{ {
put_cred(revert_creds_light(original)); put_cred(revert_creds(original));
} }
static void static void

View File

@ -523,7 +523,7 @@ out_path_release:
} }
out: out:
if (old_cred) if (old_cred)
put_cred(revert_creds_light(old_cred)); put_cred(revert_creds(old_cred));
return res; return res;
} }

View File

@ -749,7 +749,7 @@ static int ovl_prep_cu_creds(struct dentry *dentry, struct ovl_cu_creds *cc)
static void ovl_revert_cu_creds(struct ovl_cu_creds *cc) static void ovl_revert_cu_creds(struct ovl_cu_creds *cc)
{ {
if (cc->new) { if (cc->new) {
put_cred(revert_creds_light(cc->old)); put_cred(revert_creds(cc->old));
put_cred(cc->new); put_cred(cc->new);
} }
} }

View File

@ -575,7 +575,7 @@ static const struct cred *ovl_setup_cred_for_create(struct dentry *dentry,
} }
/* /*
* Caller is going to match this with revert_creds_light() and drop * Caller is going to match this with revert_creds() and drop
* referenec on the returned creds. * referenec on the returned creds.
* We must be called with creator creds already, otherwise we risk * We must be called with creator creds already, otherwise we risk
* leaking creds. * leaking creds.

View File

@ -70,7 +70,7 @@ const struct cred *ovl_override_creds(struct super_block *sb)
void ovl_revert_creds(const struct cred *old_cred) void ovl_revert_creds(const struct cred *old_cred)
{ {
revert_creds_light(old_cred); revert_creds(old_cred);
} }
/* /*

View File

@ -175,7 +175,7 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo,
cifs_dbg(FYI, "key description = %s\n", description); cifs_dbg(FYI, "key description = %s\n", description);
saved_cred = override_creds(get_new_cred(spnego_cred)); saved_cred = override_creds(get_new_cred(spnego_cred));
spnego_key = request_key(&cifs_spnego_key_type, description, ""); spnego_key = request_key(&cifs_spnego_key_type, description, "");
put_cred(revert_creds_light(saved_cred)); put_cred(revert_creds(saved_cred));
#ifdef CONFIG_CIFS_DEBUG2 #ifdef CONFIG_CIFS_DEBUG2
if (cifsFYI && !IS_ERR(spnego_key)) { if (cifsFYI && !IS_ERR(spnego_key)) {

View File

@ -327,7 +327,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid)
out_key_put: out_key_put:
key_put(sidkey); key_put(sidkey);
out_revert_creds: out_revert_creds:
put_cred(revert_creds_light(saved_cred)); put_cred(revert_creds(saved_cred));
return rc; return rc;
invalidate_key: invalidate_key:
@ -438,7 +438,7 @@ try_upcall_to_get_id:
out_key_put: out_key_put:
key_put(sidkey); key_put(sidkey);
out_revert_creds: out_revert_creds:
put_cred(revert_creds_light(saved_cred)); put_cred(revert_creds(saved_cred));
kfree(sidstr); kfree(sidstr);
/* /*

View File

@ -800,7 +800,7 @@ void ksmbd_revert_fsids(struct ksmbd_work *work)
WARN_ON(!work->saved_cred); WARN_ON(!work->saved_cred);
cred = current_cred(); cred = current_cred();
put_cred(revert_creds_light(work->saved_cred)); put_cred(revert_creds(work->saved_cred));
put_cred(cred); put_cred(cred);
work->saved_cred = NULL; work->saved_cred = NULL;
} }

View File

@ -178,7 +178,7 @@ static inline const struct cred *override_creds(const struct cred *override_cred
return old; return old;
} }
static inline const struct cred *revert_creds_light(const struct cred *revert_cred) static inline const struct cred *revert_creds(const struct cred *revert_cred)
{ {
const struct cred *override_cred = current->cred; const struct cred *override_cred = current->cred;

View File

@ -1739,7 +1739,7 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
audit_uring_exit(!ret, ret); audit_uring_exit(!ret, ret);
if (creds) if (creds)
put_cred(revert_creds_light(creds)); put_cred(revert_creds(creds));
if (ret == IOU_OK) { if (ret == IOU_OK) {
if (issue_flags & IO_URING_F_COMPLETE_DEFER) if (issue_flags & IO_URING_F_COMPLETE_DEFER)

View File

@ -192,7 +192,7 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, bool cap_entries)
if (to_submit && wq_has_sleeper(&ctx->sqo_sq_wait)) if (to_submit && wq_has_sleeper(&ctx->sqo_sq_wait))
wake_up(&ctx->sqo_sq_wait); wake_up(&ctx->sqo_sq_wait);
if (creds) if (creds)
put_cred(revert_creds_light(creds)); put_cred(revert_creds(creds));
} }
return ret; return ret;

View File

@ -541,7 +541,7 @@ static void do_acct_process(struct bsd_acct_struct *acct)
} }
out: out:
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
put_cred(revert_creds_light(orig_cred)); put_cred(revert_creds(orig_cred));
} }
/** /**

View File

@ -5220,7 +5220,7 @@ static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf,
ret = cgroup_attach_permissions(src_cgrp, dst_cgrp, ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,
of->file->f_path.dentry->d_sb, of->file->f_path.dentry->d_sb,
threadgroup, ctx->ns); threadgroup, ctx->ns);
put_cred(revert_creds_light(saved_cred)); put_cred(revert_creds(saved_cred));
if (ret) if (ret)
goto out_finish; goto out_finish;

View File

@ -1476,7 +1476,7 @@ static int user_event_set_call_visible(struct user_event *user, bool visible)
else else
ret = trace_remove_event_call(&user->call); ret = trace_remove_event_call(&user->call);
put_cred(revert_creds_light(old_cred)); put_cred(revert_creds(old_cred));
put_cred(cred); put_cred(cred);
return ret; return ret;

View File

@ -126,7 +126,7 @@ int dns_query(struct net *net,
*/ */
saved_cred = override_creds(get_new_cred(dns_resolver_cache)); saved_cred = override_creds(get_new_cred(dns_resolver_cache));
rkey = request_key_net(&key_type_dns_resolver, desc, net, options); rkey = request_key_net(&key_type_dns_resolver, desc, net, options);
put_cred(revert_creds_light(saved_cred)); put_cred(revert_creds(saved_cred));
kfree(desc); kfree(desc);
if (IS_ERR(rkey)) { if (IS_ERR(rkey)) {
ret = PTR_ERR(rkey); ret = PTR_ERR(rkey);