tree-wide: s/override_creds_light()/override_creds()/g

Rename all calls to override_creds_light() back to overrid_creds().

Link: https://lore.kernel.org/r/20241125-work-cred-v2-5-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>

diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index b5677e173f91d39dcca5078fe611ed54883f3014..294c75025dcb2577b5df64bf771ea0c1e82d5582 100644 (file)
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -911,7 +911,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
                ret = -ENOMEM;
                goto out;
        }
-       old_cred = override_creds_light(get_new_cred(kern_cred));
+       old_cred = override_creds(get_new_cred(kern_cred));
 
        ret = fw_get_filesystem_firmware(device, fw->priv, "", NULL);
 

diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 9111a51d53e0e74e6d66bffe5b4e1bf1bf9157d0..ffae20fd52bc03e7123b116251c77a3ccd7c6cde 100644 (file)
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -244,7 +244,7 @@ static struct file *open_file_as_root(const char *filename, int flags, umode_t m
        if (!cred)
                return ERR_PTR(-ENOMEM);
        cred->fsuid = GLOBAL_ROOT_UID;
-       old_cred = override_creds_light(get_new_cred(cred));
+       old_cred = override_creds(get_new_cred(cred));
 
        fp = file_open_root(&root, filename, flags, mode);
        path_put(&root);

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 564bc71d2d0923b9fdd575d520fd22206259b40a..7788e1fe2633ded4f265ff874c62dc4a21fd1b6e 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -3756,7 +3756,7 @@ static int __init target_core_init_configfs(void)
                ret = -ENOMEM;
                goto out;
        }
-       old_cred = override_creds_light(get_new_cred(kern_cred));
+       old_cred = override_creds(get_new_cred(kern_cred));
        target_init_dbroot();
        put_cred(revert_creds_light(old_cred));
        put_cred(kern_cred);

diff --git a/fs/aio.c b/fs/aio.c
index 6b987c48b6712abe2601b23f6aa9fac74c09161c..7e0ec687f480c05358c6c40638a7e187aafd8124 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1639,7 +1639,7 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb,
 static void aio_fsync_work(struct work_struct *work)
 {
        struct aio_kiocb *iocb = container_of(work, struct aio_kiocb, fsync.work);
-       const struct cred *old_cred = override_creds_light(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);
        put_cred(revert_creds_light(old_cred));

diff --git a/fs/backing-file.c b/fs/backing-file.c
index cbdad8b684742ecd7a72e45e4ee975e7569596a9..37c5a66e5dadc9e5feea23e7ab07293afe888dce 100644 (file)
--- a/fs/backing-file.c
+++ b/fs/backing-file.c
@@ -176,7 +176,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,
            !(file->f_mode & FMODE_CAN_ODIRECT))
                return -EINVAL;
 
-       old_cred = override_creds_light(ctx->cred);
+       old_cred = override_creds(ctx->cred);
        if (is_sync_kiocb(iocb)) {
                rwf_t rwf = iocb_to_rw_flags(flags);
 
@@ -233,7 +233,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
         */
        flags &= ~IOCB_DIO_CALLER_COMP;
 
-       old_cred = override_creds_light(ctx->cred);
+       old_cred = override_creds(ctx->cred);
        if (is_sync_kiocb(iocb)) {
                rwf_t rwf = iocb_to_rw_flags(flags);
 
@@ -281,7 +281,7 @@ ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,
        if (WARN_ON_ONCE(!(in->f_mode & FMODE_BACKING)))
                return -EIO;
 
-       old_cred = override_creds_light(ctx->cred);
+       old_cred = override_creds(ctx->cred);
        ret = vfs_splice_read(in, &iocb->ki_pos, pipe, len, flags);
        revert_creds_light(old_cred);
 
@@ -310,7 +310,7 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
        if (ret)
                return ret;
 
-       old_cred = override_creds_light(ctx->cred);
+       old_cred = override_creds(ctx->cred);
        file_start_write(out);
        ret = out->f_op->splice_write(pipe, out, &iocb->ki_pos, len, flags);
        file_end_write(out);
@@ -338,7 +338,7 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
 
        vma_set_file(vma, file);
 
-       old_cred = override_creds_light(ctx->cred);
+       old_cred = override_creds(ctx->cred);
        ret = call_mmap(vma->vm_file, vma);
        revert_creds_light(old_cred);
 

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 586862ca87386023902ba186ca7dd957f08de1f8..5756ec49f79e08342ce5607f85fd576496a86bcd 100644 (file)
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -829,7 +829,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
                 * didn't matter much as only a privileged process could open
                 * the register file.
                 */
-               old_cred = override_creds_light(get_new_cred(file->f_cred));
+               old_cred = override_creds(get_new_cred(file->f_cred));
                f = open_exec(e->interpreter);
                put_cred(revert_creds_light(old_cred));
                if (IS_ERR(f)) {

diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
index 809305dd531760d47e781064c1fc6e328849fc6b..05b1d4cfb55afefd025c5f9c08afa81f67fdb9eb 100644 (file)
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
@@ -393,7 +393,7 @@ extern int cachefiles_determine_cache_security(struct cachefiles_cache *cache,
 static inline void cachefiles_begin_secure(struct cachefiles_cache *cache,
                                           const struct cred **_saved_cred)
 {
-       *_saved_cred = override_creds_light(get_new_cred(cache->cache_cred));
+       *_saved_cred = override_creds(get_new_cred(cache->cache_cred));
 }
 
 static inline void cachefiles_end_secure(struct cachefiles_cache *cache,

diff --git a/fs/coredump.c b/fs/coredump.c
index ff119aaa5c313306b1183270a5d95904ed5951f4..4eae37892da58e982b53da4596952a1b3d2e1630 100644 (file)
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -576,7 +576,7 @@ void do_coredump(const kernel_siginfo_t *siginfo)
        if (retval < 0)
                goto fail_creds;
 
-       old_cred = override_creds_light(get_new_cred(cred));
+       old_cred = override_creds(get_new_cred(cred));
 
        ispipe = format_corename(&cn, &cprm, &argv, &argc);
 

diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c
index deca5559a56b23bc4aef45d320ab3d105a8dc239..682d951ed69adc6a0a7e595a2fb4f9fe4437bae1 100644 (file)
--- a/fs/nfs/localio.c
+++ b/fs/nfs/localio.c
@@ -374,7 +374,7 @@ static void nfs_local_call_read(struct work_struct *work)
        struct iov_iter iter;
        ssize_t status;
 
-       save_cred = override_creds_light(get_new_cred(filp->f_cred));
+       save_cred = override_creds(get_new_cred(filp->f_cred));
 
        nfs_local_iter_init(&iter, iocb, READ);
 
@@ -545,7 +545,7 @@ static void nfs_local_call_write(struct work_struct *work)
        ssize_t status;
 
        current->flags |= PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO;
-       save_cred = override_creds_light(get_new_cred(filp->f_cred));
+       save_cred = override_creds(get_new_cred(filp->f_cred));
 
        nfs_local_iter_init(&iter, iocb, WRITE);
 

diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c
index 629979b20e98cbc37e148289570574d9ba2e7675..3cae4057f8ba30914a91a3d368ace8f52175644d 100644 (file)
--- a/fs/nfs/nfs4idmap.c
+++ b/fs/nfs/nfs4idmap.c
@@ -311,7 +311,7 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen,
        const struct user_key_payload *payload;
        ssize_t ret;
 
-       saved_cred = override_creds_light(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);
        put_cred(revert_creds_light(saved_cred));
 

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index dda14811d092689e5aa44bdd29f25403e4e3a780..dafea9183b4e6413d61c0c83a1b8f26a9712d5c6 100644 (file)
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -79,7 +79,7 @@ int nfsd_setuser(struct svc_cred *cred, struct svc_export *exp)
        else
                new->cap_effective = cap_raise_nfsd_set(new->cap_effective,
                                                        new->cap_permitted);
-       put_cred(override_creds_light(get_new_cred(new)));
+       put_cred(override_creds(get_new_cred(new)));
        put_cred(new);
        return 0;
 

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index bf166a23d8b4f14cbfd7c2635ccf5be7c710117c..0ab22b4e940fe9bcf587d9134e91975e44243e11 100644 (file)
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -81,7 +81,7 @@ nfs4_save_creds(const struct cred **original_creds)
 
        new->fsuid = GLOBAL_ROOT_UID;
        new->fsgid = GLOBAL_ROOT_GID;
-       *original_creds = override_creds_light(get_new_cred(new));
+       *original_creds = override_creds(get_new_cred(new));
        put_cred(new);
        return 0;
 }

diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 4819364190d3651a8be60da6a98b0988e8e92c68..1cf52f3d541220c7326341cc622f60047e78e6d2 100644 (file)
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -221,7 +221,7 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct net *net,
                new->cap_effective =
                        cap_raise_nfsd_set(new->cap_effective,
                                           new->cap_permitted);
-               put_cred(override_creds_light(get_new_cred(new)));
+               put_cred(override_creds(get_new_cred(new)));
                put_cred(new);
        } else {
                error = nfsd_setuser_and_check_port(rqstp, cred, exp);

diff --git a/fs/open.c b/fs/open.c
index 23c414c10883927129a925a33680affc6f3a0a78..bd0a34653f0ebe210ddfeabf5ea3bc002bf2833d 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -448,7 +448,7 @@ static const struct cred *access_override_creds(void)
         */
        override_cred->non_rcu = 1;
 
-       old_cred = override_creds_light(get_new_cred(override_cred));
+       old_cred = override_creds(get_new_cred(override_cred));
 
        /* override_cred() gets its own ref */
        put_cred(override_cred);

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 0f19bdbc78a45f35df2829ccc8cc65deef244ffd..7805667b2e05264c011cd41ff6f77b9ae0fb30d9 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -741,7 +741,7 @@ static int ovl_prep_cu_creds(struct dentry *dentry, struct ovl_cu_creds *cc)
                return err;
 
        if (cc->new)
-               cc->old = override_creds_light(get_new_cred(cc->new));
+               cc->old = override_creds(get_new_cred(cc->new));
 
        return 0;
 }

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 08e683917d121b1fe8f0f0b4d4ba4f0f3c72f47d..151271f0586c7249cfa61cd45d249ec930adaf82 100644 (file)
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -580,7 +580,7 @@ static const struct cred *ovl_setup_cred_for_create(struct dentry *dentry,
         * We must be called with creator creds already, otherwise we risk
         * leaking creds.
         */
-       old_cred = override_creds_light(override_cred);
+       old_cred = override_creds(override_cred);
        WARN_ON_ONCE(old_cred != ovl_creds(dentry->d_sb));
 
        return override_cred;

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index 9aa7493b1e10365cbcc97fceab26d614a319727f..2513a79a10b0bd69fa9d1c8a0f4726f3246ac39c 100644 (file)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -65,7 +65,7 @@ const struct cred *ovl_override_creds(struct super_block *sb)
 {
        struct ovl_fs *ofs = OVL_FS(sb);
 
-       return override_creds_light(ofs->creator_cred);
+       return override_creds(ofs->creator_cred);
 }
 
 void ovl_revert_creds(const struct cred *old_cred)

diff --git a/fs/smb/client/cifs_spnego.c b/fs/smb/client/cifs_spnego.c
index f2353bccc9f5e4637772a89dd0b0f42861fd21f3..f22dc0be357fa03cecc524976de5c69fddeef1ca 100644 (file)
--- a/fs/smb/client/cifs_spnego.c
+++ b/fs/smb/client/cifs_spnego.c
@@ -173,7 +173,7 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo,
        }
 
        cifs_dbg(FYI, "key description = %s\n", description);
-       saved_cred = override_creds_light(get_new_cred(spnego_cred));
+       saved_cred = override_creds(get_new_cred(spnego_cred));
        spnego_key = request_key(&cifs_spnego_key_type, description, "");
        put_cred(revert_creds_light(saved_cred));
 

diff --git a/fs/smb/client/cifsacl.c b/fs/smb/client/cifsacl.c
index 81d8d9802a56d4bb5d3d0480396f0c78c4c3fb80..d65e094b97cb2b1bd1c79d1959443fd8cae93f8f 100644 (file)
--- a/fs/smb/client/cifsacl.c
+++ b/fs/smb/client/cifsacl.c
@@ -292,7 +292,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid)
                return -EINVAL;
 
        rc = 0;
-       saved_cred = override_creds_light(get_new_cred(root_cred));
+       saved_cred = override_creds(get_new_cred(root_cred));
        sidkey = request_key(&cifs_idmap_key_type, desc, "");
        if (IS_ERR(sidkey)) {
                rc = -EINVAL;
@@ -398,7 +398,7 @@ try_upcall_to_get_id:
        if (!sidstr)
                return -ENOMEM;
 
-       saved_cred = override_creds_light(get_new_cred(root_cred));
+       saved_cred = override_creds(get_new_cred(root_cred));
        sidkey = request_key(&cifs_idmap_key_type, sidstr, "");
        if (IS_ERR(sidkey)) {
                cifs_dbg(FYI, "%s: Can't map SID %s to a %cid\n",

diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
index 1bd9b9c9db702e8eb771317a2351146ce0654077..4a4cb9e4d45a711bfd87c53610e0a5ec0f636401 100644 (file)
--- a/fs/smb/server/smb_common.c
+++ b/fs/smb/server/smb_common.c
@@ -780,7 +780,7 @@ int __ksmbd_override_fsids(struct ksmbd_work *work,
                cred->cap_effective = cap_drop_fs_set(cred->cap_effective);
 
        WARN_ON(work->saved_cred);
-       work->saved_cred = override_creds_light(get_new_cred(cred));
+       work->saved_cred = override_creds(get_new_cred(cred));
        if (!work->saved_cred) {
                abort_creds(cred);
                return -EINVAL;

diff --git a/include/linux/cred.h b/include/linux/cred.h
index 80dcc18ef6e402a3a30e2dc965e6c85eb9f27ee3..a073e6163c4ea5a78fc950d834bffeab9c5ba2be 100644 (file)
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -170,7 +170,7 @@ static inline bool cap_ambient_invariant_ok(const struct cred *cred)
                                          cred->cap_inheritable));
 }
 
-static inline const struct cred *override_creds_light(const struct cred *override_cred)
+static inline const struct cred *override_creds(const struct cred *override_cred)
 {
        const struct cred *old = current->cred;
 

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 66b5bd9d26ab9fd8d3919bac406d47a9dd4aae87..5b1cc024deea09efc6e5b8b66fc5f8c685715afd 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1728,7 +1728,7 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
                return -EBADF;
 
        if (unlikely((req->flags & REQ_F_CREDS) && req->creds != current_cred()))
-               creds = override_creds_light(get_new_cred(req->creds));
+               creds = override_creds(get_new_cred(req->creds));
 
        if (!def->audit_skip)
                audit_uring_entry(req->opcode);

diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 42ca6e07e0f7b0fe54a9f09857f87fecb5aa7085..0fd424442118f38db0307fe10e0c6ee102c1f185 100644 (file)
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -174,7 +174,7 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, bool cap_entries)
                const struct cred *creds = NULL;
 
                if (ctx->sq_creds != current_cred())
-                       creds = override_creds_light(get_new_cred(ctx->sq_creds));
+                       creds = override_creds(get_new_cred(ctx->sq_creds));
 
                mutex_lock(&ctx->uring_lock);
                if (!wq_list_empty(&ctx->iopoll_list))

diff --git a/kernel/acct.c b/kernel/acct.c
index 4e28aa9e1ef278cd7fb3160a27b549155ceaffc3..a51a3b483fd9d94da916dc4e052ef4ab1042a39f 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -501,7 +501,7 @@ static void do_acct_process(struct bsd_acct_struct *acct)
        flim = rlimit(RLIMIT_FSIZE);
        current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
        /* Perform file operations on behalf of whoever enabled accounting */
-       orig_cred = override_creds_light(get_new_cred(file->f_cred));
+       orig_cred = override_creds(get_new_cred(file->f_cred));
 
        /*
         * First check to see if there is enough free_space to continue

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 68b816955c9c7e0141a073f54b14949b4c37aae6..2d618b577e52e0117f77340dac79581882599578 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5216,7 +5216,7 @@ static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf,
         * permissions using the credentials from file open to protect against
         * inherited fd attacks.
         */
-       saved_cred = override_creds_light(get_new_cred(of->file->f_cred));
+       saved_cred = override_creds(get_new_cred(of->file->f_cred));
        ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,
                                        of->file->f_path.dentry->d_sb,
                                        threadgroup, ctx->ns);

diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c
index 2fdadb2e8547ec86f48d84c81c95434c811cb3cd..857124d81f1255e7e6b4d18009b53191a71b57fc 100644 (file)
--- a/kernel/trace/trace_events_user.c
+++ b/kernel/trace/trace_events_user.c
@@ -1469,7 +1469,7 @@ static int user_event_set_call_visible(struct user_event *user, bool visible)
         */
        cred->fsuid = GLOBAL_ROOT_UID;
 
-       old_cred = override_creds_light(get_new_cred(cred));
+       old_cred = override_creds(get_new_cred(cred));
 
        if (visible)
                ret = trace_add_event_call(&user->call);

diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index 297059b7e2a367f5e745aac4557cda5996689a00..f8749d688d6676dd83d0c4b8e83ca893f1bd4248 100644 (file)
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -124,7 +124,7 @@ int dns_query(struct net *net,
        /* make the upcall, using special credentials to prevent the use of
         * add_key() to preinstall malicious redirections
         */
-       saved_cred = override_creds_light(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);
        put_cred(revert_creds_light(saved_cred));
        kfree(desc);