Skip to content

Commit

Permalink
security: remove dead hook cred_commit
Browse files Browse the repository at this point in the history
Unused hook.  Remove.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
Eric Paris authored and James Morris committed Apr 12, 2010
1 parent 9d5ed77 commit 0968d00
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 23 deletions.
11 changes: 0 additions & 11 deletions include/linux/security.h
Original file line number Diff line number Diff line change
Expand Up @@ -652,10 +652,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
* @old points to the original credentials.
* @gfp indicates the atomicity of any memory allocations.
* 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:
* @new points to the new credentials.
* @old points to the original credentials.
Expand Down Expand Up @@ -1536,7 +1532,6 @@ struct security_operations {
void (*cred_free) (struct cred *cred);
int (*cred_prepare)(struct cred *new, const struct cred *old,
gfp_t gfp);
void (*cred_commit)(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_create_files_as)(struct cred *new, struct inode *inode);
Expand Down Expand Up @@ -1794,7 +1789,6 @@ int security_task_create(unsigned long clone_flags);
int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
void security_cred_free(struct cred *cred);
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);
int security_kernel_act_as(struct cred *new, u32 secid);
int security_kernel_create_files_as(struct cred *new, struct inode *inode);
Expand Down Expand Up @@ -2315,11 +2309,6 @@ static inline int security_prepare_creds(struct cred *new,
return 0;
}

static inline void security_commit_creds(struct cred *new,
const struct cred *old)
{
}

static inline void security_transfer_creds(struct cred *new,
const struct cred *old)
{
Expand Down
2 changes: 0 additions & 2 deletions kernel/cred.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,6 @@ int commit_creds(struct cred *new)
#endif
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 */

/* dumpability changes */
Expand Down
5 changes: 0 additions & 5 deletions security/capability.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,6 @@ static int cap_cred_prepare(struct cred *new, const struct cred *old, gfp_t gfp)
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)
{
}
Expand Down Expand Up @@ -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_free);
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, kernel_act_as);
set_to_cap_if_null(ops, kernel_create_files_as);
Expand Down
5 changes: 0 additions & 5 deletions security/security.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

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)
{
security_ops->cred_transfer(new, old);
Expand Down

0 comments on commit 0968d00

Please sign in to comment.