From: Serge E. Hallyn <serue@us.ibm.com>
Date: Mon, 28 Apr 2008 09:13:43 +0000 (-0700)
Subject: smack: use cap_task_prctl
X-Git-Tag: v2.6.26-rc1~919
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1236cc3cf8c69bd316c940b2e94f91b3795f97fe;p=linux-2.6-omap-h63xx.git

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>
---

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,