diff options
| author | Chris Wright <chris@wirex.com> | 2003-06-13 04:27:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-13 04:27:07 -0700 |
| commit | 351907094f893dd931fa87785321ded97235e6b8 (patch) | |
| tree | 91a08eaffc04f1e3b4010aed0af9afbcfa99e997 /security | |
| parent | 553bd5a2715ae7a5c858fde11873d0640065c29e (diff) | |
| download | history-351907094f893dd931fa87785321ded97235e6b8.tar.gz | |
[PATCH] lsm: Remove task_kmod_set_label hook (2/4)
The task_kmod_set_label hook is no longer necessary.
kmod is now handled by keventd which already does reparent_to_init, so
there is no need to worry about getting the security labels right for
code running off the keventd workqueue.
Diffstat (limited to 'security')
| -rw-r--r-- | security/capability.c | 8 | ||||
| -rw-r--r-- | security/dummy.c | 6 | ||||
| -rw-r--r-- | security/root_plug.c | 1 |
3 files changed, 0 insertions, 15 deletions
diff --git a/security/capability.c b/security/capability.c index 9b2b9862d03564..e2496a3f39abf2 100644 --- a/security/capability.c +++ b/security/capability.c @@ -248,12 +248,6 @@ int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, return 0; } -void cap_task_kmod_set_label (void) -{ - cap_set_full (current->cap_effective); - return; -} - void cap_task_reparent_to_init (struct task_struct *p) { p->cap_effective = CAP_INIT_EFF_SET; @@ -278,7 +272,6 @@ EXPORT_SYMBOL(cap_capset_set); EXPORT_SYMBOL(cap_bprm_set_security); EXPORT_SYMBOL(cap_bprm_compute_creds); EXPORT_SYMBOL(cap_task_post_setuid); -EXPORT_SYMBOL(cap_task_kmod_set_label); EXPORT_SYMBOL(cap_task_reparent_to_init); EXPORT_SYMBOL(cap_syslog); @@ -298,7 +291,6 @@ static struct security_operations capability_ops = { .bprm_set_security = cap_bprm_set_security, .task_post_setuid = cap_task_post_setuid, - .task_kmod_set_label = cap_task_kmod_set_label, .task_reparent_to_init = cap_task_reparent_to_init, .syslog = cap_syslog, diff --git a/security/dummy.c b/security/dummy.c index 4774b769a6de64..5873fef1ae4c44 100644 --- a/security/dummy.c +++ b/security/dummy.c @@ -517,11 +517,6 @@ static int dummy_task_prctl (int option, unsigned long arg2, unsigned long arg3, return 0; } -static void dummy_task_kmod_set_label (void) -{ - return; -} - static void dummy_task_reparent_to_init (struct task_struct *p) { p->euid = p->fsuid = 0; @@ -871,7 +866,6 @@ void security_fixup_ops (struct security_operations *ops) set_to_dummy_if_null(ops, task_wait); set_to_dummy_if_null(ops, task_kill); set_to_dummy_if_null(ops, task_prctl); - set_to_dummy_if_null(ops, task_kmod_set_label); set_to_dummy_if_null(ops, task_reparent_to_init); set_to_dummy_if_null(ops, task_to_inode); set_to_dummy_if_null(ops, ipc_permission); diff --git a/security/root_plug.c b/security/root_plug.c index 73ee98192b3aba..c683d613332172 100644 --- a/security/root_plug.c +++ b/security/root_plug.c @@ -94,7 +94,6 @@ static struct security_operations rootplug_security_ops = { .bprm_set_security = cap_bprm_set_security, .task_post_setuid = cap_task_post_setuid, - .task_kmod_set_label = cap_task_kmod_set_label, .task_reparent_to_init = cap_task_reparent_to_init, .bprm_check_security = rootplug_bprm_check_security, |