aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:15:13 -0400
committerJames Morris <jmorris@namei.org>2010-04-11 22:19:18 -0400
commit6307f8fee295b364716d28686df6e69c2fee751a (patch)
treeda2d51edcca32dd71c2a3a6f74bf56e88a60293f
parent06ad187e280e725e356c62c3a30ddcd01564f8be (diff)
security: remove dead hook task_setgroups
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.h12
-rw-r--r--kernel/groups.c6
-rw-r--r--security/capability.c6
-rw-r--r--security/security.c5
4 files changed, 0 insertions, 29 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 04ce0d6e4edf..73505f0c9b75 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -704,11 +704,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
704 * @p contains the task_struct for the process and place is into @secid. 704 * @p contains the task_struct for the process and place is into @secid.
705 * In case of failure, @secid will be set to zero. 705 * In case of failure, @secid will be set to zero.
706 * 706 *
707 * @task_setgroups:
708 * Check permission before setting the supplementary group set of the
709 * current process.
710 * @group_info contains the new group information.
711 * Return 0 if permission is granted.
712 * @task_setnice: 707 * @task_setnice:
713 * Check permission before setting the nice value of @p to @nice. 708 * Check permission before setting the nice value of @p to @nice.
714 * @p contains the task_struct of process. 709 * @p contains the task_struct of process.
@@ -1518,7 +1513,6 @@ struct security_operations {
1518 int (*task_getpgid) (struct task_struct *p); 1513 int (*task_getpgid) (struct task_struct *p);
1519 int (*task_getsid) (struct task_struct *p); 1514 int (*task_getsid) (struct task_struct *p);
1520 void (*task_getsecid) (struct task_struct *p, u32 *secid); 1515 void (*task_getsecid) (struct task_struct *p, u32 *secid);
1521 int (*task_setgroups) (struct group_info *group_info);
1522 int (*task_setnice) (struct task_struct *p, int nice); 1516 int (*task_setnice) (struct task_struct *p, int nice);
1523 int (*task_setioprio) (struct task_struct *p, int ioprio); 1517 int (*task_setioprio) (struct task_struct *p, int ioprio);
1524 int (*task_getioprio) (struct task_struct *p); 1518 int (*task_getioprio) (struct task_struct *p);
@@ -1773,7 +1767,6 @@ int security_task_setpgid(struct task_struct *p, pid_t pgid);
1773int security_task_getpgid(struct task_struct *p); 1767int security_task_getpgid(struct task_struct *p);
1774int security_task_getsid(struct task_struct *p); 1768int security_task_getsid(struct task_struct *p);
1775void security_task_getsecid(struct task_struct *p, u32 *secid); 1769void security_task_getsecid(struct task_struct *p, u32 *secid);
1776int security_task_setgroups(struct group_info *group_info);
1777int security_task_setnice(struct task_struct *p, int nice); 1770int security_task_setnice(struct task_struct *p, int nice);
1778int security_task_setioprio(struct task_struct *p, int ioprio); 1771int security_task_setioprio(struct task_struct *p, int ioprio);
1779int security_task_getioprio(struct task_struct *p); 1772int security_task_getioprio(struct task_struct *p);
@@ -2329,11 +2322,6 @@ static inline void security_task_getsecid(struct task_struct *p, u32 *secid)
2329 *secid = 0; 2322 *secid = 0;
2330} 2323}
2331 2324
2332static inline int security_task_setgroups(struct group_info *group_info)
2333{
2334 return 0;
2335}
2336
2337static inline int security_task_setnice(struct task_struct *p, int nice) 2325static inline int security_task_setnice(struct task_struct *p, int nice)
2338{ 2326{
2339 return cap_task_setnice(p, nice); 2327 return cap_task_setnice(p, nice);
diff --git a/kernel/groups.c b/kernel/groups.c
index 2b45b2ee3964..53b1916c9492 100644
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -164,12 +164,6 @@ int groups_search(const struct group_info *group_info, gid_t grp)
164 */ 164 */
165int set_groups(struct cred *new, struct group_info *group_info) 165int set_groups(struct cred *new, struct group_info *group_info)
166{ 166{
167 int retval;
168
169 retval = security_task_setgroups(group_info);
170 if (retval)
171 return retval;
172
173 put_group_info(new->group_info); 167 put_group_info(new->group_info);
174 groups_sort(group_info); 168 groups_sort(group_info);
175 get_group_info(group_info); 169 get_group_info(group_info);
diff --git a/security/capability.c b/security/capability.c
index 66cd7453563f..247c04edd468 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -412,11 +412,6 @@ static void cap_task_getsecid(struct task_struct *p, u32 *secid)
412 *secid = 0; 412 *secid = 0;
413} 413}
414 414
415static int cap_task_setgroups(struct group_info *group_info)
416{
417 return 0;
418}
419
420static int cap_task_getioprio(struct task_struct *p) 415static int cap_task_getioprio(struct task_struct *p)
421{ 416{
422 return 0; 417 return 0;
@@ -967,7 +962,6 @@ void security_fixup_ops(struct security_operations *ops)
967 set_to_cap_if_null(ops, task_getpgid); 962 set_to_cap_if_null(ops, task_getpgid);
968 set_to_cap_if_null(ops, task_getsid); 963 set_to_cap_if_null(ops, task_getsid);
969 set_to_cap_if_null(ops, task_getsecid); 964 set_to_cap_if_null(ops, task_getsecid);
970 set_to_cap_if_null(ops, task_setgroups);
971 set_to_cap_if_null(ops, task_setnice); 965 set_to_cap_if_null(ops, task_setnice);
972 set_to_cap_if_null(ops, task_setioprio); 966 set_to_cap_if_null(ops, task_setioprio);
973 set_to_cap_if_null(ops, task_getioprio); 967 set_to_cap_if_null(ops, task_getioprio);
diff --git a/security/security.c b/security/security.c
index 1e35dd669209..5cf9ca6890f6 100644
--- a/security/security.c
+++ b/security/security.c
@@ -759,11 +759,6 @@ void security_task_getsecid(struct task_struct *p, u32 *secid)
759} 759}
760EXPORT_SYMBOL(security_task_getsecid); 760EXPORT_SYMBOL(security_task_getsecid);
761 761
762int security_task_setgroups(struct group_info *group_info)
763{
764 return security_ops->task_setgroups(group_info);
765}
766
767int security_task_setnice(struct task_struct *p, int nice) 762int security_task_setnice(struct task_struct *p, int nice)
768{ 763{
769 return security_ops->task_setnice(p, nice); 764 return security_ops->task_setnice(p, nice);