Let the spectator see all.
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Wed, 23 Jul 2008 16:38:43 +0000 (16:38 +0000)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Wed, 23 Jul 2008 16:38:43 +0000 (16:38 +0000)
delta-ptrace-fix01.diff [new file with mode: 0644]
kernel-2.6.spec

diff --git a/delta-ptrace-fix01.diff b/delta-ptrace-fix01.diff
new file mode 100644 (file)
index 0000000..86545bc
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Nurp linux-2.6.22.19-vs2.3.0.34.8/kernel/ptrace.c linux-2.6.22.19-vs2.3.0.34.9/kernel/ptrace.c
+--- linux-2.6.22.19-vs2.3.0.34.8/kernel/ptrace.c       2008-03-15 08:16:10.000000000 -0400
++++ linux-2.6.22.19-vs2.3.0.34.9/kernel/ptrace.c       2008-07-23 12:32:11.000000000 -0400
+@@ -146,7 +146,7 @@ static int may_attach(struct task_struct
+               dumpable = task->mm->dumpable;
+       if (!dumpable && !capable(CAP_SYS_PTRACE))
+               return -EPERM;
+-      if (!vx_check(task->xid, VS_ADMIN_P|VS_IDENT))
++      if (!vx_check(task->xid, VS_WATCH_P | VS_IDENT))
+               return -EPERM;
+       if (!vx_check(task->xid, VS_IDENT) &&
+               !task_vx_flags(task, VXF_STATE_ADMIN, 0))
index 73ecf23..9df532e 100644 (file)
@@ -155,6 +155,7 @@ Patch100: linux-2.6-100-build-nonintconfig.patch
 # Linux-VServer
 Patch200: patch-%{rpmversion}-vs%{vsversion}.diff
 Patch210: linux-2.6-210-vserver-cpu-sched.patch
+Patch220: delta-ptrace-fix01.diff
 
 # IP sets
 Patch250: linux-2.6-250-ipsets.patch
@@ -358,6 +359,7 @@ KERNEL_PREVIOUS=vanilla
 
 %ApplyPatch 200
 %ApplyPatch 210
+%ApplyPatch 220
 
 %ApplyPatch 250