From 8a68145bedd4920e5fd109ec04ee73d10b00988a Mon Sep 17 00:00:00 2001 From: James Morris Date: Thu, 29 Jan 2009 12:32:50 +1100 Subject: [PATCH] --- yaml --- r: 132591 b: refs/heads/master c: 2cbbd19812b7636c1c37bcf50c403e7af5278d73 h: refs/heads/master i: 132589: 7e0235bd6e99f503bfbbdcb8d28f621e5e731d37 132587: 59362018d96238be5a515a289b6305a61cf80899 132583: 63d69d0f940e2c5b70004134b7be6d1b80ec81c9 132575: 6031f9cac600e3cd7f859600a9674dd36c3ede59 v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index afc19103188c..45fea5aa5a91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef76e748faa823a738d632ee4c8ed9adaabc8a40 +refs/heads/master: 2cbbd19812b7636c1c37bcf50c403e7af5278d73 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index 3aaa63cc5c74..0bd36a17587c 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -3405,10 +3405,6 @@ static int selinux_task_kill(struct task_struct *p, struct siginfo *info, u32 perm; int rc; - rc = secondary_ops->task_kill(p, info, sig, secid); - if (rc) - return rc; - if (!sig) perm = PROCESS__SIGNULL; /* null signal; existence test */ else