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

Convert all callers from override_creds() to
override_creds_light(get_new_cred()) in preparation of making
override_creds() not take a separate reference at all.

Link: https://lore.kernel.org/r/20241125-work-cred-v2-1-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 cb0912ea3e627e92f2009257314531981a279a92..75eb6fd759271391706da9e40a79b944271bbc8e 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(kern_cred);
+       old_cred = override_creds_light(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 af018afd9cd7fc68c5f9004e2d0a2ee162d8c4b9..2ad6e41af085a400e88b3207c9b55345f57526e1 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(cred);
+       old_cred = override_creds_light(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 c40217f44b1bc53d149e8d5ea12c0e5297373800..be98d16b2c57c933ffe2c2477b881144f2283630 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(kern_cred);
+       old_cred = override_creds_light(get_new_cred(kern_cred));
        target_init_dbroot();
        revert_creds(old_cred);
        put_cred(kern_cred);

diff --git a/fs/aio.c b/fs/aio.c
index 50671640b5883f5d20f652e23c4ea3fe04c989f2..a52fe2e999e73b00af9a19f1c01f0e384f667871 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(iocb->fsync.creds);
+       const struct cred *old_cred = override_creds_light(get_new_cred(iocb->fsync.creds));
 
        iocb->ki_res.res = vfs_fsync(iocb->fsync.file, iocb->fsync.datasync);
        revert_creds(old_cred);

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 6a3a16f910516cb70f0c84e9147c5f13f8ad25a5..21eb501ae03d2a4e78a715031ecf2fe4932c136b 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(file->f_cred);
+               old_cred = override_creds_light(get_new_cred(file->f_cred));
                f = open_exec(e->interpreter);
                revert_creds(old_cred);
                if (IS_ERR(f)) {

diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
index 7b99bd98de75b8d95e09da1ca7cd1bb3378fcc62..b156cc2e0e63b28b521923b578cb3547dece5e66 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(cache->cache_cred);
+       *_saved_cred = override_creds_light(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 d48edb37bc35c0896d97a2f6a6cc259d8812f936..b6aae41b80d22bfed78eed6f3e45bdeb5d2daf06 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(cred);
+       old_cred = override_creds_light(get_new_cred(cred));
 
        ispipe = format_corename(&cn, &cprm, &argv, &argc);
 

diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c
index 4b8618cf114caf4c52794ae734ab9de769f12934..98393c2efb75790d7801309ec49385c0a4ceaaa8 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(filp->f_cred);
+       save_cred = override_creds_light(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(filp->f_cred);
+       save_cred = override_creds_light(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 25a7c771cfd89f3e6d494f26a78212d3d619c135..b9442f70271d8397fb36dcb62570f6d304fe5c71 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(id_resolver_cache);
+       saved_cred = override_creds_light(get_new_cred(id_resolver_cache));
        rkey = nfs_idmap_request_key(name, namelen, type, idmap);
        revert_creds(saved_cred);
 

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index 93e33d1ee8917fc5d462f56b5c65380f7555e638..614a5ec4824b4ab9f6faa132c565688c94261704 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(new));
+       put_cred(override_creds_light(get_new_cred(new)));
        put_cred(new);
        return 0;
 

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 4a765555bf8459084c431eac4293babb8a8fbfcf..886d03953d7a006a4180dc2d9f8597c4c23e7191 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(new);
+       *original_creds = override_creds_light(get_new_cred(new));
        put_cred(new);
        return 0;
 }

diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 6a831cb242dfb2dff8a9d8fc496b84c00ffc2892..4819364190d3651a8be60da6a98b0988e8e92c68 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(new));
+               put_cred(override_creds_light(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 e6911101fe71d665d5f1a6346e5f82212bb8ed65..2459cd061f47f46756b7d0a7bf2f563b631ec1d5 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(override_cred);
+       old_cred = override_creds_light(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 3601ddfeddc2ec70764756905d528570ad1020e1..527b041213c8166d60d6a273675c2e2bc18dec36 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(cc->new);
+               cc->old = override_creds_light(get_new_cred(cc->new));
 
        return 0;
 }

diff --git a/fs/smb/client/cifs_spnego.c b/fs/smb/client/cifs_spnego.c
index 28f568b5fc2771b7a11d0e83d0ac1cb9baf20636..721d8b1254b6491f0b4cb5318fd60d81e13b1599 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(spnego_cred);
+       saved_cred = override_creds_light(get_new_cred(spnego_cred));
        spnego_key = request_key(&cifs_spnego_key_type, description, "");
        revert_creds(saved_cred);
 

diff --git a/fs/smb/client/cifsacl.c b/fs/smb/client/cifsacl.c
index ba79aa2107cc9f5b5fa628e9b9998d04e78c8bc1..b1ea4ea3de4b15013ac74cfce988515613543532 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(root_cred);
+       saved_cred = override_creds_light(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(root_cred);
+       saved_cred = override_creds_light(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 4e6f169fcf83b7d5705339c603d832777a32656d..5662f2651b8eaf57875f735d855a23de0846fa40 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(cred);
+       work->saved_cred = override_creds_light(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 e4a3155fe409d6b991fa6639005ebc233fc17dcc..b0bc1fea9ca05a26f4fa719f1d4701f010994288 100644 (file)
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -211,9 +211,10 @@ static inline struct cred *get_new_cred_many(struct cred *cred, int nr)
  * Get a reference on the specified set of new credentials.  The caller must
  * release the reference.
  */
-static inline struct cred *get_new_cred(struct cred *cred)
+static inline struct cred *get_new_cred(const struct cred *cred)
 {
-       return get_new_cred_many(cred, 1);
+       struct cred *nonconst_cred = (struct cred *) cred;
+       return get_new_cred_many(nonconst_cred, 1);
 }
 
 /**

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 06ff41484e29c6e7d8779bd7ff8317ebae003a8d..0b25ddea943e53b30237d7238b487899a34e7849 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(req->creds);
+               creds = override_creds_light(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 6df5e649c413e39e36db6cde2a8c6745e533bea9..58a76d5818959a9d7eeef52a8bacd29eba3f3d26 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(ctx->sq_creds);
+                       creds = override_creds_light(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 179848ad33e978a557ce695a0d6020aa169177c6..8f18eb02dd416b884222b66f0f386379c46b30ea 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(file->f_cred);
+       orig_cred = override_creds_light(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 d9061bd55436b502e065b477a903ed682d722c2e..97329b4fe5027dcc5d80f6b074f4c494c4794df7 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(of->file->f_cred);
+       saved_cred = override_creds_light(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 17bcad8f79de70a29fb58f84ce12ffb929515794..4dd7c45d227e9459e694535cee3f853c09826cff 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(cred);
+       old_cred = override_creds_light(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 82b084cc1cc6349bb532d5ada555b0bcbb1cdbea..a54f5f841cea1edd7f449d4e3e79e37b8ed865f4 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(dns_resolver_cache);
+       saved_cred = override_creds_light(get_new_cred(dns_resolver_cache));
        rkey = request_key_net(&key_type_dns_resolver, desc, net, options);
        revert_creds(saved_cred);
        kfree(desc);