rpms/kernel/devel patch-2.6.22-rc4-git8.bz2.sign, NONE, 1.1 kernel-2.6.spec, 1.3222, 1.3223 linux-2.6-utrace.patch, 1.62, 1.63 upstream, 1.516, 1.517 patch-2.6.22-rc4-git7.bz2.sign, 1.1, NONE

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11308

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch upstream 
Added Files:
	patch-2.6.22-rc4-git8.bz2.sign 
Removed Files:
	patch-2.6.22-rc4-git7.bz2.sign 
Log Message:
* Sat Jun 16 2007 Dave Jones <davej at redhat.com>
- 2.6.22-rc4-git8. (utrace broke, temporarily disabled).



--- NEW FILE patch-2.6.22-rc4-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBGc4rtyGugalF9Dw4RAiaJAKCF+lFRR/D+cvU1IMPGBb0kgwiqTQCgiZu4
lBNZTkviJzNS3K4iXluoF4w=
=Rw7V
-----END PGP SIGNATURE-----


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3222
retrieving revision 1.3223
diff -u -r1.3222 -r1.3223
--- kernel-2.6.spec	15 Jun 2007 19:25:34 -0000	1.3222
+++ kernel-2.6.spec	16 Jun 2007 14:47:17 -0000	1.3223
@@ -421,7 +421,7 @@
 %else
 # Here should be only the patches up to the upstream canonical Linus tree.
 Patch00: patch-2.6.22-rc4.bz2
-Patch01: patch-2.6.22-rc4-git7.bz2
+Patch01: patch-2.6.22-rc4-git8.bz2
 %endif
 
 %if !%{nopatches}
@@ -915,7 +915,9 @@
 # Patches 10 through 100 are meant for core subsystem upgrades
 
 # Roland's utrace ptrace replacement.
-ApplyPatch linux-2.6-utrace.patch
+#ApplyPatch linux-2.6-utrace.patch
+# setuid /proc/self/maps fix. (dependant on utrace)
+#ApplyPatch linux-2.6-proc-self-maps-fix.patch
 
 # Nouveau DRM
 #ApplyPatch nouveau-drm.patch
@@ -1056,8 +1058,6 @@
 ApplyPatch linux-2.6-serial-460800.patch
 # Fix XFS umount bug.
 ApplyPatch linux-2.6-xfs-umount-fix.patch
-# setuid /proc/self/maps fix.
-ApplyPatch linux-2.6-proc-self-maps-fix.patch
 # Add a safety net to softlockup so that it doesn't prevent installs.
 ApplyPatch linux-2.6-softlockup-disable.patch
 # Speed up spinlock debug.
@@ -2084,6 +2084,9 @@
 %endif
 
 %changelog
+* Sat Jun 16 2007 Dave Jones <davej at redhat.com>
+- 2.6.22-rc4-git8. (utrace broke, temporarily disabled).
+
 * Fri Jun 15 2007 Dave Jones <davej at redhat.com>
 - 2.6.22-rc4-git7.
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- linux-2.6-utrace.patch	9 Jun 2007 07:37:55 -0000	1.62
+++ linux-2.6-utrace.patch	16 Jun 2007 14:47:17 -0000	1.63
@@ -15115,7 +15115,7 @@
 +}
 --- linux-2.6/kernel/ptrace.c
 +++ linux-2.6/kernel/ptrace.c
-@@ -18,476 +18,1997 @@
+@@ -18,476 +18,2003 @@
  #include <linux/ptrace.h>
  #include <linux/security.h>
  #include <linux/signal.h>
@@ -16280,21 +16280,29 @@
 -	if (IS_ERR(child)) {
 -		ret = PTR_ERR(child);
 -		goto out;
-+		pr_debug("%d not stopped (%lu)\n", child->pid, child->state);
-+		goto out_tsk_rcu;
- 	}
+-	}
++		if (ret) {
++			pr_debug("%d not stopped (%lu)\n",
++				 child->pid, child->state);
++			goto out_tsk_rcu;
++		}
  
 -	if (request == PTRACE_ATTACH) {
 -		ret = ptrace_attach(child);
 -		goto out_put_task_struct;
--	}
-+	rcu_read_unlock();
++		ret = -ESRCH;  /* Return value for exit_state bail-out.  */
+ 	}
  
 -	ret = ptrace_check_attach(child, request == PTRACE_KILL);
 -	if (ret < 0)
 -		goto out_put_task_struct;
-+	NO_LOCKS;
++	rcu_read_unlock();
 +
++	NO_LOCKS;
+ 
+-	ret = arch_ptrace(child, request, addr, data);
+-	if (ret < 0)
+-		goto out_put_task_struct;
 +	/*
 +	 * We do this for all requests to match traditional ptrace behavior.
 +	 * If the machine state synchronization done at context switch time
@@ -16308,10 +16316,7 @@
 +	 *  (void) utrace_regset(child, engine, utrace_native_view(child), 0);
 +	 */
 +	wait_task_inactive(child);
- 
--	ret = arch_ptrace(child, request, addr, data);
--	if (ret < 0)
--		goto out_put_task_struct;
++
 +	if (child->exit_state)
 +		goto out_tsk;
  
@@ -16792,13 +16797,6 @@
 +		 current->pid, tsk->pid, p->pid, exit_code,
 +		 p->exit_state, p->exit_signal);
 +
-+	/*
-+	 * If there was a group exit in progress, all threads report that
-+	 * status.  Most will have SIGKILL in their own exit_code.
-+	 */
-+	if (p->signal->flags & SIGNAL_GROUP_EXIT)
-+		exit_code = p->signal->group_exit_code;
-+
 +	if (p->exit_state) {
 +		if (unlikely(p->parent == tsk && p->exit_signal != -1))
 +			/*
@@ -16809,6 +16807,14 @@
 +			 * the normal wait_task_zombie path instead.
 +			 */
 +			return 0;
++
++		/*
++		 * If there was a group exit in progress, all threads
++		 * report that status.  Most have SIGKILL in their exit_code.
++		 */
++		if (p->signal->flags & SIGNAL_GROUP_EXIT)
++			exit_code = p->signal->group_exit_code;
++
 +		if ((exit_code & 0x7f) == 0) {
 +			why = CLD_EXITED;
 +			status = exit_code >> 8;


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -r1.516 -r1.517
--- upstream	15 Jun 2007 19:25:34 -0000	1.516
+++ upstream	16 Jun 2007 14:47:17 -0000	1.517
@@ -1,3 +1,3 @@
 linux-2.6.21.tar.bz2
 patch-2.6.22-rc4.bz2
-patch-2.6.22-rc4-git7.bz2
+patch-2.6.22-rc4-git8.bz2


--- patch-2.6.22-rc4-git7.bz2.sign DELETED ---