From: Serge E. Hallyn Date: Mon, 28 Apr 2008 09:13:42 +0000 (-0700) Subject: root_plug: use cap_task_prctl X-Git-Tag: v2.6.26-rc1~921 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=55d00ccfb336b4f85a476a24e18c17b2eaff919e;p=linux-2.6-omap-h63xx.git root_plug: use cap_task_prctl With the introduction of per-process securebits, the capabilities-related prctl callbacks were moved into cap_task_prctl(). Have root_plug use cap_task_prctl() so that PR_SET_KEEPCAPS is defined. Signed-off-by: Serge E. Hallyn Acked-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/security/root_plug.c b/security/root_plug.c index 6112d1404c8..a41cf42a4fa 100644 --- a/security/root_plug.c +++ b/security/root_plug.c @@ -86,6 +86,7 @@ static struct security_operations rootplug_security_ops = { .task_post_setuid = cap_task_post_setuid, .task_reparent_to_init = cap_task_reparent_to_init, + .task_prctl = cap_task_prctl, .bprm_check_security = rootplug_bprm_check_security, };