X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=security%2Fcommoncap.c;h=841eb4e5c62b6e91b0e799802791289366bfb45d;hb=92445eaaadc1f03f5a177ecc957bda76bf2ba8d5;hp=04c12f58d656200b29c1e0c60c31e7ac62349741;hpb=6c89cce75c6f93088a5a2a25bb9674a9194592cc;p=linux-2.6

diff --git a/security/commoncap.c b/security/commoncap.c
index 04c12f58d6..841eb4e5c6 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -7,6 +7,7 @@
  *
  */
 
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -59,8 +60,8 @@ int cap_settime(struct timespec *ts, struct timezone *tz)
 int cap_ptrace (struct task_struct *parent, struct task_struct *child)
 {
 	/* Derived from arch/i386/kernel/ptrace.c:sys_ptrace. */
-	if (!cap_issubset (child->cap_permitted, current->cap_permitted) &&
-	    !capable(CAP_SYS_PTRACE))
+	if (!cap_issubset(child->cap_permitted, parent->cap_permitted) &&
+	    !__capable(parent, CAP_SYS_PTRACE))
 		return -EPERM;
 	return 0;
 }