Commit 6307f8fe authored by Eric Paris's avatar Eric Paris Committed by James Morris
Browse files

security: remove dead hook task_setgroups 



Unused hook.  Remove.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 06ad187e

include/linux/security.h

+0 −12
Original line number Diff line number Diff line
@@ -704,11 +704,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	@p contains the task_struct for the process and place is into @secid.

 *	In case of failure, @secid will be set to zero.

 *

 * @task_setgroups:

 *	Check permission before setting the supplementary group set of the

 *	current process.

 *	@group_info contains the new group information.

 *	Return 0 if permission is granted.

 * @task_setnice:

 *	Check permission before setting the nice value of @p to @nice.

 *	@p contains the task_struct of process.
@@ -1518,7 +1513,6 @@ struct security_operations { 
	int (*task_getpgid) (struct task_struct *p);

	int (*task_getsid) (struct task_struct *p);

	void (*task_getsecid) (struct task_struct *p, u32 *secid);

	int (*task_setgroups) (struct group_info *group_info);

	int (*task_setnice) (struct task_struct *p, int nice);

	int (*task_setioprio) (struct task_struct *p, int ioprio);

	int (*task_getioprio) (struct task_struct *p);
@@ -1773,7 +1767,6 @@ int security_task_setpgid(struct task_struct *p, pid_t pgid); 
int security_task_getpgid(struct task_struct *p);

int security_task_getsid(struct task_struct *p);

void security_task_getsecid(struct task_struct *p, u32 *secid);

int security_task_setgroups(struct group_info *group_info);

int security_task_setnice(struct task_struct *p, int nice);

int security_task_setioprio(struct task_struct *p, int ioprio);

int security_task_getioprio(struct task_struct *p);
@@ -2329,11 +2322,6 @@ static inline void security_task_getsecid(struct task_struct *p, u32 *secid) 
	*secid = 0;

}



static inline int security_task_setgroups(struct group_info *group_info)

{

	return 0;

}



static inline int security_task_setnice(struct task_struct *p, int nice)

{

	return cap_task_setnice(p, nice);

kernel/groups.c

+0 −6
Original line number Diff line number Diff line
@@ -164,12 +164,6 @@ int groups_search(const struct group_info *group_info, gid_t grp) 
 */

int set_groups(struct cred *new, struct group_info *group_info)

{

	int retval;



	retval = security_task_setgroups(group_info);

	if (retval)

		return retval;



	put_group_info(new->group_info);

	groups_sort(group_info);

	get_group_info(group_info);

security/capability.c

+0 −6
Original line number Diff line number Diff line
@@ -412,11 +412,6 @@ static void cap_task_getsecid(struct task_struct *p, u32 *secid) 
	*secid = 0;

}



static int cap_task_setgroups(struct group_info *group_info)

{

	return 0;

}



static int cap_task_getioprio(struct task_struct *p)

{

	return 0;
@@ -967,7 +962,6 @@ void security_fixup_ops(struct security_operations *ops) 
	set_to_cap_if_null(ops, task_getpgid);

	set_to_cap_if_null(ops, task_getsid);

	set_to_cap_if_null(ops, task_getsecid);

	set_to_cap_if_null(ops, task_setgroups);

	set_to_cap_if_null(ops, task_setnice);

	set_to_cap_if_null(ops, task_setioprio);

	set_to_cap_if_null(ops, task_getioprio);

security/security.c

+0 −5
Original line number Diff line number Diff line
@@ -759,11 +759,6 @@ void security_task_getsecid(struct task_struct *p, u32 *secid) 
}

EXPORT_SYMBOL(security_task_getsecid);



int security_task_setgroups(struct group_info *group_info)

{

	return security_ops->task_setgroups(group_info);

}



int security_task_setnice(struct task_struct *p, int nice)

{

	return security_ops->task_setnice(p, nice);