Commit 0968d006 authored by Eric Paris's avatar Eric Paris Committed by James Morris

security: remove dead hook cred_commit

Unused hook.  Remove.
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 9d5ed77d
...@@ -652,10 +652,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) ...@@ -652,10 +652,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
* @old points to the original credentials. * @old points to the original credentials.
* @gfp indicates the atomicity of any memory allocations. * @gfp indicates the atomicity of any memory allocations.
* Prepare a new set of credentials by copying the data from the old set. * Prepare a new set of credentials by copying the data from the old set.
* @cred_commit:
* @new points to the new credentials.
* @old points to the original credentials.
* Install a new set of credentials.
* @cred_transfer: * @cred_transfer:
* @new points to the new credentials. * @new points to the new credentials.
* @old points to the original credentials. * @old points to the original credentials.
...@@ -1536,7 +1532,6 @@ struct security_operations { ...@@ -1536,7 +1532,6 @@ struct security_operations {
void (*cred_free) (struct cred *cred); void (*cred_free) (struct cred *cred);
int (*cred_prepare)(struct cred *new, const struct cred *old, int (*cred_prepare)(struct cred *new, const struct cred *old,
gfp_t gfp); gfp_t gfp);
void (*cred_commit)(struct cred *new, const struct cred *old);
void (*cred_transfer)(struct cred *new, const struct cred *old); void (*cred_transfer)(struct cred *new, const struct cred *old);
int (*kernel_act_as)(struct cred *new, u32 secid); int (*kernel_act_as)(struct cred *new, u32 secid);
int (*kernel_create_files_as)(struct cred *new, struct inode *inode); int (*kernel_create_files_as)(struct cred *new, struct inode *inode);
...@@ -1794,7 +1789,6 @@ int security_task_create(unsigned long clone_flags); ...@@ -1794,7 +1789,6 @@ int security_task_create(unsigned long clone_flags);
int security_cred_alloc_blank(struct cred *cred, gfp_t gfp); int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
void security_cred_free(struct cred *cred); void security_cred_free(struct cred *cred);
int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp); int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp);
void security_commit_creds(struct cred *new, const struct cred *old);
void security_transfer_creds(struct cred *new, const struct cred *old); void security_transfer_creds(struct cred *new, const struct cred *old);
int security_kernel_act_as(struct cred *new, u32 secid); int security_kernel_act_as(struct cred *new, u32 secid);
int security_kernel_create_files_as(struct cred *new, struct inode *inode); int security_kernel_create_files_as(struct cred *new, struct inode *inode);
...@@ -2315,11 +2309,6 @@ static inline int security_prepare_creds(struct cred *new, ...@@ -2315,11 +2309,6 @@ static inline int security_prepare_creds(struct cred *new,
return 0; return 0;
} }
static inline void security_commit_creds(struct cred *new,
const struct cred *old)
{
}
static inline void security_transfer_creds(struct cred *new, static inline void security_transfer_creds(struct cred *new,
const struct cred *old) const struct cred *old)
{ {
......
...@@ -520,8 +520,6 @@ int commit_creds(struct cred *new) ...@@ -520,8 +520,6 @@ int commit_creds(struct cred *new)
#endif #endif
BUG_ON(atomic_read(&new->usage) < 1); BUG_ON(atomic_read(&new->usage) < 1);
security_commit_creds(new, old);
get_cred(new); /* we will require a ref for the subj creds too */ get_cred(new); /* we will require a ref for the subj creds too */
/* dumpability changes */ /* dumpability changes */
......
...@@ -373,10 +373,6 @@ static int cap_cred_prepare(struct cred *new, const struct cred *old, gfp_t gfp) ...@@ -373,10 +373,6 @@ static int cap_cred_prepare(struct cred *new, const struct cred *old, gfp_t gfp)
return 0; return 0;
} }
static void cap_cred_commit(struct cred *new, const struct cred *old)
{
}
static void cap_cred_transfer(struct cred *new, const struct cred *old) static void cap_cred_transfer(struct cred *new, const struct cred *old)
{ {
} }
...@@ -972,7 +968,6 @@ void security_fixup_ops(struct security_operations *ops) ...@@ -972,7 +968,6 @@ void security_fixup_ops(struct security_operations *ops)
set_to_cap_if_null(ops, cred_alloc_blank); set_to_cap_if_null(ops, cred_alloc_blank);
set_to_cap_if_null(ops, cred_free); set_to_cap_if_null(ops, cred_free);
set_to_cap_if_null(ops, cred_prepare); set_to_cap_if_null(ops, cred_prepare);
set_to_cap_if_null(ops, cred_commit);
set_to_cap_if_null(ops, cred_transfer); set_to_cap_if_null(ops, cred_transfer);
set_to_cap_if_null(ops, kernel_act_as); set_to_cap_if_null(ops, kernel_act_as);
set_to_cap_if_null(ops, kernel_create_files_as); set_to_cap_if_null(ops, kernel_create_files_as);
......
...@@ -712,11 +712,6 @@ int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp) ...@@ -712,11 +712,6 @@ int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp)
return security_ops->cred_prepare(new, old, gfp); return security_ops->cred_prepare(new, old, gfp);
} }
void security_commit_creds(struct cred *new, const struct cred *old)
{
security_ops->cred_commit(new, old);
}
void security_transfer_creds(struct cred *new, const struct cred *old) void security_transfer_creds(struct cred *new, const struct cred *old)
{ {
security_ops->cred_transfer(new, old); security_ops->cred_transfer(new, old);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment