diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-28 21:30:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-28 21:30:34 -0800 |
| commit | 267ebfd662f32df647e0803ca5d2a26e7d7cc060 (patch) | |
| tree | e6b8e4e05219645e13ab2af4fba0ff85f40cf850 /kernel/capability.c | |
| parent | 9179a307bffc558ccd8cff8334ca08ef2b68ea1b (diff) | |
| parent | efdddf70cc1946feb4b00b1771cce3aef8efcc0e (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/lsm-2.5
Diffstat (limited to 'kernel/capability.c')
| -rw-r--r-- | kernel/capability.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index 774cf612d8c5..6ced2afcc509 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -8,6 +8,7 @@ */ #include <linux/mm.h> +#include <linux/security.h> #include <asm/uaccess.h> unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */ @@ -63,7 +64,7 @@ asmlinkage long sys_capget(cap_user_header_t header, cap_user_data_t dataptr) data.permitted = cap_t(target->cap_permitted); data.inheritable = cap_t(target->cap_inheritable); data.effective = cap_t(target->cap_effective); - ret = security_ops->capget(target, &data.effective, &data.inheritable, &data.permitted); + ret = security_capget(target, &data.effective, &data.inheritable, &data.permitted); out: read_unlock(&tasklist_lock); @@ -88,7 +89,7 @@ static inline void cap_set_pg(int pgrp, kernel_cap_t *effective, do_each_thread(g, target) { if (target->pgrp != pgrp) continue; - security_ops->capset_set(target, effective, inheritable, permitted); + security_capset_set(target, effective, inheritable, permitted); } while_each_thread(g, target); } @@ -105,7 +106,7 @@ static inline void cap_set_all(kernel_cap_t *effective, do_each_thread(g, target) { if (target == current || target->pid == 1) continue; - security_ops->capset_set(target, effective, inheritable, permitted); + security_capset_set(target, effective, inheritable, permitted); } while_each_thread(g, target); } @@ -163,7 +164,7 @@ asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data) ret = -EPERM; - if (security_ops->capset_check(target, &effective, &inheritable, &permitted)) + if (security_capset_check(target, &effective, &inheritable, &permitted)) goto out; if (!cap_issubset(inheritable, cap_combine(target->cap_inheritable, @@ -190,7 +191,7 @@ asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data) else /* all procs in process group */ cap_set_pg(-pid, &effective, &inheritable, &permitted); } else { - security_ops->capset_set(target, &effective, &inheritable, &permitted); + security_capset_set(target, &effective, &inheritable, &permitted); } out: |