Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25

[sfrench/cifs-2.6.git] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index 5aba82679a0bb9e5506628c9190846a1134707e7..bb0c095f5761c7bfc23b4f1782a504a40c8322e4 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -552,7 +552,7 @@ int cap_task_kill(struct task_struct *p, struct siginfo *info,
         * allowed.
         * We must preserve legacy signal behavior in this case.
         */
-       if (p->euid == 0 && p->uid == current->uid)
+       if (p->uid == current->uid)
                return 0;
 
        /* sigcont is permitted within same session */