Skip to content

Commit a51a1d6

Browse files
committed
cred: remove old {override,revert}_creds() helpers
They are now unused. 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 f905e00 commit a51a1d6

File tree

2 files changed

+0
-57
lines changed

2 files changed

+0
-57
lines changed

include/linux/cred.h

-7
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@ extern struct cred *prepare_creds(void);
155155
extern struct cred *prepare_exec_creds(void);
156156
extern int commit_creds(struct cred *);
157157
extern void abort_creds(struct cred *);
158-
extern const struct cred *override_creds(const struct cred *);
159-
extern void revert_creds(const struct cred *);
160158
extern struct cred *prepare_kernel_cred(struct task_struct *);
161159
extern int set_security_override(struct cred *, u32);
162160
extern int set_security_override_from_ctx(struct cred *, const char *);
@@ -172,11 +170,6 @@ static inline bool cap_ambient_invariant_ok(const struct cred *cred)
172170
cred->cap_inheritable));
173171
}
174172

175-
/*
176-
* Override creds without bumping reference count. Caller must ensure
177-
* reference remains valid or has taken reference. Almost always not the
178-
* interface you want. Use override_creds()/revert_creds() instead.
179-
*/
180173
static inline const struct cred *override_creds_light(const struct cred *override_cred)
181174
{
182175
const struct cred *old = current->cred;

kernel/cred.c

-50
Original file line numberDiff line numberDiff line change
@@ -476,56 +476,6 @@ void abort_creds(struct cred *new)
476476
}
477477
EXPORT_SYMBOL(abort_creds);
478478

479-
/**
480-
* override_creds - Override the current process's subjective credentials
481-
* @new: The credentials to be assigned
482-
*
483-
* Install a set of temporary override subjective credentials on the current
484-
* process, returning the old set for later reversion.
485-
*/
486-
const struct cred *override_creds(const struct cred *new)
487-
{
488-
const struct cred *old;
489-
490-
kdebug("override_creds(%p{%ld})", new,
491-
atomic_long_read(&new->usage));
492-
493-
/*
494-
* NOTE! This uses 'get_new_cred()' rather than 'get_cred()'.
495-
*
496-
* That means that we do not clear the 'non_rcu' flag, since
497-
* we are only installing the cred into the thread-synchronous
498-
* '->cred' pointer, not the '->real_cred' pointer that is
499-
* visible to other threads under RCU.
500-
*/
501-
get_new_cred((struct cred *)new);
502-
old = override_creds_light(new);
503-
504-
kdebug("override_creds() = %p{%ld}", old,
505-
atomic_long_read(&old->usage));
506-
return old;
507-
}
508-
EXPORT_SYMBOL(override_creds);
509-
510-
/**
511-
* revert_creds - Revert a temporary subjective credentials override
512-
* @old: The credentials to be restored
513-
*
514-
* Revert a temporary set of override subjective credentials to an old set,
515-
* discarding the override set.
516-
*/
517-
void revert_creds(const struct cred *old)
518-
{
519-
const struct cred *override = current->cred;
520-
521-
kdebug("revert_creds(%p{%ld})", old,
522-
atomic_long_read(&old->usage));
523-
524-
revert_creds_light(old);
525-
put_cred(override);
526-
}
527-
EXPORT_SYMBOL(revert_creds);
528-
529479
/**
530480
* cred_fscmp - Compare two credentials with respect to filesystem access.
531481
* @a: The first credential

0 commit comments

Comments
 (0)