From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Thu, 29 Apr 2010 18:43:34 +0000 (+0000)
Subject: add delta-ptrace-fix01.diff
X-Git-Tag: linux-2.6-32-0~23
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=fb30f7c64e3c867f25ccbb8db194bdb6e054150b

add delta-ptrace-fix01.diff
---

diff --git a/delta-ptrace-fix01.diff b/delta-ptrace-fix01.diff
new file mode 100644
index 000000000..de0a81b3a
--- /dev/null
+++ b/delta-ptrace-fix01.diff
@@ -0,0 +1,13 @@
+Index: linux-2.6.27.y/kernel/ptrace.c
+===================================================================
+--- linux-2.6.27.y.orig/kernel/ptrace.c
++++ linux-2.6.27.y/kernel/ptrace.c
+@@ -140,7 +140,7 @@ int __ptrace_may_access(struct task_stru
+ 		dumpable = get_dumpable(task->mm);
+ 	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))
diff --git a/kernel.spec b/kernel.spec
index 1745d1bcd..87825c58d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1851,6 +1851,7 @@ Patch1237: mm-Switch-to-SLAB.patch
 Patch1238: redhat-kABI-Update-the-kABI-for-2-6-18-el6.patch
 
 Patch88888: patch-2.6.32-19.el6-vs2.3.0.36.29.4.diff
+Patch90220: delta-ptrace-fix01.diff
 Patch90250: linux-2.6-250-ipsets.patch
 Patch90510: linux-2.6-510-ipod.patch
 Patch90521: linux-2.6-521-packet-tagging.patch
@@ -1876,7 +1877,9 @@ Patch90640:  linux-2.6-640-netlink-audit-hack.patch
 Patch90650:  linux-2.6-650-hangcheck-reboot.patch
 Patch90660:  linux-2.6-660-nmi-watchdog-default.patch
 Patch90680:  linux-2.6-680-htb-hysteresis-tso.patch
-
+#
+#Patch90700: linux-2.6-700-egre.patch
+#
 
 # empty final patch file to facilitate testing of kernel patches
 Patch99999: linux-kernel-test.patch
@@ -3495,6 +3498,7 @@ ApplyPatch mm-Switch-to-SLAB.patch
 ApplyPatch redhat-kABI-Update-the-kABI-for-2-6-18-el6.patch
 
 ApplyPatch patch-2.6.32-19.el6-vs2.3.0.36.29.4.diff
+ApplyPatch delta-ptrace-fix01.diff
 ApplyPatch linux-2.6-250-ipsets.patch
 ApplyPatch linux-2.6-510-ipod.patch
 ApplyPatch linux-2.6-521-packet-tagging.patch
@@ -3520,7 +3524,9 @@ ApplyPatch linux-2.6-640-netlink-audit-hack.patch
 ApplyPatch linux-2.6-650-hangcheck-reboot.patch
 ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
 ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
-
+#
+#ApplyPatch linux-2.6-700-egre.patch
+#
 
 ApplyOptionalPatch linux-kernel-test.patch