aboutsummaryrefslogtreecommitdiff
path: root/security/smack
diff options
context:
space:
mode:
authorSerge E. Hallyn <serue@us.ibm.com>2008-04-28 02:13:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 08:58:27 -0700
commit1236cc3cf8c69bd316c940b2e94f91b3795f97fe (patch)
treec33374ffa89d34f901d91888851970071700c38d /security/smack
parent30aa4faf62b2dd9b239ae06ca7a85f1d36d7ef25 (diff)
downloadlinux-2.6.38-lt-ux500-1236cc3cf8c69bd316c940b2e94f91b3795f97fe.tar.gz
smack: use cap_task_prctl
With the introduction of per-process securebits, the capabilities-related prctl callbacks were moved into cap_task_prctl(). Have smack use cap_task_prctl() so that PR_SET_KEEPCAPS is defined. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Acked-by: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/smack')
-rw-r--r--security/smack/smack_lsm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 430f97b9d04..77ec16a3b68 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2495,6 +2495,7 @@ struct security_operations smack_ops = {
.task_wait = smack_task_wait,
.task_reparent_to_init = cap_task_reparent_to_init,
.task_to_inode = smack_task_to_inode,
+ .task_prctl = cap_task_prctl,
.ipc_permission = smack_ipc_permission,