aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:14:56 -0400
committerJames Morris <jmorris@namei.org>2010-04-11 22:19:15 -0400
commit0968d0060a3c885e53d453380266c7792a55d302 (patch)
treeb8511f3bf4aa4cfb21421ab5dde8346f0119dbe3
parent9d5ed77dadc66a72b40419c91df942adfa55a102 (diff)
security: remove dead hook cred_commit
Unused hook. Remove. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--include/linux/security.h11
-rw-r--r--kernel/cred.c2
-rw-r--r--security/capability.c5
-rw-r--r--security/security.c5
4 files changed, 0 insertions, 23 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index ef6edc759891..33b0c1b27f82 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -652,10 +652,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
652 * @old points to the original credentials. 652 * @old points to the original credentials.
653 * @gfp indicates the atomicity of any memory allocations. 653 * @gfp indicates the atomicity of any memory allocations.
654 * Prepare a new set of credentials by copying the data from the old set. 654 * Prepare a new set of credentials by copying the data from the old set.
655 * @cred_commit:
656 * @new points to the new credentials.
657 * @old points to the original credentials.
658 * Install a new set of credentials.
659 * @cred_transfer: 655 * @cred_transfer:
660 * @new points to the new credentials. 656 * @new points to the new credentials.
661 * @old points to the original credentials. 657 * @old points to the original credentials.
@@ -1536,7 +1532,6 @@ struct security_operations {
1536 void (*cred_free) (struct cred *cred); 1532 void (*cred_free) (struct cred *cred);
1537 int (*cred_prepare)(struct cred *new, const struct cred *old, 1533 int (*cred_prepare)(struct cred *new, const struct cred *old,
1538 gfp_t gfp); 1534 gfp_t gfp);
1539 void (*cred_commit)(struct cred *new, const struct cred *old);
1540 void (*cred_transfer)(struct cred *new, const struct cred *old); 1535 void (*cred_transfer)(struct cred *new, const struct cred *old);
1541 int (*kernel_act_as)(struct cred *new, u32 secid); 1536 int (*kernel_act_as)(struct cred *new, u32 secid);
1542 int (*kernel_create_files_as)(struct cred *new, struct inode *inode); 1537 int (*kernel_create_files_as)(struct cred *new, struct inode *inode);
@@ -1794,7 +1789,6 @@ int security_task_create(unsigned long clone_flags);
1794int security_cred_alloc_blank(struct cred *cred, gfp_t gfp); 1789int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
1795void security_cred_free(struct cred *cred); 1790void security_cred_free(struct cred *cred);
1796int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp); 1791int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp);
1797void security_commit_creds(struct cred *new, const struct cred *old);
1798void security_transfer_creds(struct cred *new, const struct cred *old); 1792void security_transfer_creds(struct cred *new, const struct cred *old);
1799int security_kernel_act_as(struct cred *new, u32 secid); 1793int security_kernel_act_as(struct cred *new, u32 secid);
1800int security_kernel_create_files_as(struct cred *new, struct inode *inode); 1794int 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 return 0; 2309 return 0;
2316} 2310}
2317 2311
2318static inline void security_commit_creds(struct cred *new,
2319 const struct cred *old)
2320{
2321}
2322
2323static inline void security_transfer_creds(struct cred *new, 2312static inline void security_transfer_creds(struct cred *new,
2324 const struct cred *old) 2313 const struct cred *old)
2325{ 2314{
diff --git a/kernel/cred.c b/kernel/cred.c
index 1b1129d0cce8..fecb34640482 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -520,8 +520,6 @@ int commit_creds(struct cred *new)
520#endif 520#endif
521 BUG_ON(atomic_read(&new->usage) < 1); 521 BUG_ON(atomic_read(&new->usage) < 1);
522 522
523 security_commit_creds(new, old);
524
525 get_cred(new); /* we will require a ref for the subj creds too */ 523 get_cred(new); /* we will require a ref for the subj creds too */
526 524
527 /* dumpability changes */ 525 /* dumpability changes */
diff --git a/security/capability.c b/security/capability.c
index b855e9f27f0e..a927bdea1816 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -373,10 +373,6 @@ static int cap_cred_prepare(struct cred *new, const struct cred *old, gfp_t gfp)
373 return 0; 373 return 0;
374} 374}
375 375
376static void cap_cred_commit(struct cred *new, const struct cred *old)
377{
378}
379
380static void cap_cred_transfer(struct cred *new, const struct cred *old) 376static void cap_cred_transfer(struct cred *new, const struct cred *old)
381{ 377{
382} 378}
@@ -972,7 +968,6 @@ void security_fixup_ops(struct security_operations *ops)
972 set_to_cap_if_null(ops, cred_alloc_blank); 968 set_to_cap_if_null(ops, cred_alloc_blank);
973 set_to_cap_if_null(ops, cred_free); 969 set_to_cap_if_null(ops, cred_free);
974 set_to_cap_if_null(ops, cred_prepare); 970 set_to_cap_if_null(ops, cred_prepare);
975 set_to_cap_if_null(ops, cred_commit);
976 set_to_cap_if_null(ops, cred_transfer); 971 set_to_cap_if_null(ops, cred_transfer);
977 set_to_cap_if_null(ops, kernel_act_as); 972 set_to_cap_if_null(ops, kernel_act_as);
978 set_to_cap_if_null(ops, kernel_create_files_as); 973 set_to_cap_if_null(ops, kernel_create_files_as);
diff --git a/security/security.c b/security/security.c
index c65b0bca05bb..6e5942653d4f 100644
--- a/security/security.c
+++ b/security/security.c
@@ -712,11 +712,6 @@ int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp)
712 return security_ops->cred_prepare(new, old, gfp); 712 return security_ops->cred_prepare(new, old, gfp);
713} 713}
714 714
715void security_commit_creds(struct cred *new, const struct cred *old)
716{
717 security_ops->cred_commit(new, old);
718}
719
720void security_transfer_creds(struct cred *new, const struct cred *old) 715void security_transfer_creds(struct cred *new, const struct cred *old)
721{ 716{
722 security_ops->cred_transfer(new, old); 717 security_ops->cred_transfer(new, old);