diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/capability.c | 6 | ||||
-rw-r--r-- | security/security.c | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/security/capability.c b/security/capability.c index 41ff54f3b4d..66cd7453563 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -392,11 +392,6 @@ static int cap_kernel_module_request(char *kmod_name) | |||
392 | return 0; | 392 | return 0; |
393 | } | 393 | } |
394 | 394 | ||
395 | static int cap_task_setgid(gid_t id0, gid_t id1, gid_t id2, int flags) | ||
396 | { | ||
397 | return 0; | ||
398 | } | ||
399 | |||
400 | static int cap_task_setpgid(struct task_struct *p, pid_t pgid) | 395 | static int cap_task_setpgid(struct task_struct *p, pid_t pgid) |
401 | { | 396 | { |
402 | return 0; | 397 | return 0; |
@@ -968,7 +963,6 @@ void security_fixup_ops(struct security_operations *ops) | |||
968 | set_to_cap_if_null(ops, kernel_create_files_as); | 963 | set_to_cap_if_null(ops, kernel_create_files_as); |
969 | set_to_cap_if_null(ops, kernel_module_request); | 964 | set_to_cap_if_null(ops, kernel_module_request); |
970 | set_to_cap_if_null(ops, task_fix_setuid); | 965 | set_to_cap_if_null(ops, task_fix_setuid); |
971 | set_to_cap_if_null(ops, task_setgid); | ||
972 | set_to_cap_if_null(ops, task_setpgid); | 966 | set_to_cap_if_null(ops, task_setpgid); |
973 | set_to_cap_if_null(ops, task_getpgid); | 967 | set_to_cap_if_null(ops, task_getpgid); |
974 | set_to_cap_if_null(ops, task_getsid); | 968 | set_to_cap_if_null(ops, task_getsid); |
diff --git a/security/security.c b/security/security.c index 3900da3da87..1e35dd66920 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -738,11 +738,6 @@ int security_task_fix_setuid(struct cred *new, const struct cred *old, | |||
738 | return security_ops->task_fix_setuid(new, old, flags); | 738 | return security_ops->task_fix_setuid(new, old, flags); |
739 | } | 739 | } |
740 | 740 | ||
741 | int security_task_setgid(gid_t id0, gid_t id1, gid_t id2, int flags) | ||
742 | { | ||
743 | return security_ops->task_setgid(id0, id1, id2, flags); | ||
744 | } | ||
745 | |||
746 | int security_task_setpgid(struct task_struct *p, pid_t pgid) | 741 | int security_task_setpgid(struct task_struct *p, pid_t pgid) |
747 | { | 742 | { |
748 | return security_ops->task_setpgid(p, pgid); | 743 | return security_ops->task_setpgid(p, pgid); |