r3651 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-08-01 00:52:45 +0000 (Mon, 01 Aug 2005)
New Revision: 3651

Removed:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-exec-real_timer-reset.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
Log:
2.6.8 doesn't have real_timer

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-07-31 19:44:25 UTC (rev 3650)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-08-01 00:52:45 UTC (rev 3651)
@@ -151,12 +151,6 @@
     patch to apply cleanly.
     See CAN-2005-1761. (Simon Horman)
 
-  * fs-exec-real_timer-reset.dpatch
-    [Security] Reset real_timer target on exec leader change
-    to avoid race condition which could lead to
-    to invalid kernel memory being accesed and an oops.
-    (Simon Horman)
-
   * Makefile-gcc-3.3.dpatch, control
     Build with gcc-3.3, as gcc-4.0, now the dedault in unstable,
     fails to build this source. As this tree is primarily
@@ -165,7 +159,7 @@
     there is some value in being able to use it with unstable.
     (Simon Horman)
 
- -- Simon Horman <horms at debian.org>  Fri, 29 Jul 2005 19:26:10 +0900
+ -- Simon Horman <horms at debian.org>  Mon,  1 Aug 2005 09:52:08 +0900
 
 kernel-source-2.6.8 (2.6.8-16) unstable; urgency=low
 

Deleted: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-exec-real_timer-reset.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-exec-real_timer-reset.dpatch	2005-07-31 19:44:25 UTC (rev 3650)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-exec-real_timer-reset.dpatch	2005-08-01 00:52:45 UTC (rev 3651)
@@ -1,51 +0,0 @@
-commit 5323125031799a7fd8602ce150c3902aedfdcba6
-tree 43281ea094cba176e88ba50561e2a04aa8beed8c
-parent 5c888d531823f8ce2853fb717ebefbcca9acdcd0
-author Roland McGrath <roland at redhat.com> 1121201907 -0700
-committer Linus Torvalds <torvalds at g5.osdl.org> 1121209261 -0700
-
-[PATCH] reset real_timer target on exec leader change
-
-When a noninitial thread does exec, it becomes the new group leader.  If
-there is a ITIMER_REAL timer running, it points at the old group leader and
-when it fires it can follow a stale pointer.  The timer data needs to be
-reset to point at the exec'ing thread that is becoming the group leader.
-This has to synchronize with any concurrent firing of the timer to make
-sure that it_real_fn can never run when the data points to a thread that
-might have been reaped already.
-
-Signed-off-by: Roland McGrath <roland at redhat.com>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
-Signed-off-by: Linus Torvalds <torvalds at osdl.org>
-
-R:100644 100644 48871917d3639c2b4d679ddd47d0db10651dc88c 222ab1c572d884762bae366086bbe145f8e0f65b M	fs/exec.c
-
-Key:
-S: Skipped
-I: Included Included verbatim
-D: Deleted  Manually deleted by subsequent user edit
-R: Revised  Manually revised by subsequent user edit
-
-Rediffed for Debian - Horms
-
---- a/fs/exec.c	2005-07-29 18:46:45.000000000 +0900
-+++ b/fs/exec.c	2005-07-29 18:52:22.000000000 +0900
-@@ -631,6 +631,18 @@
- 	count = 2;
- 	if (current->pid == current->tgid)
- 		count = 1;
-+	else {
-+		/*
-+		 * The SIGALRM timer survives the exec, but needs to point
-+		 * at us as the new group leader now.  We have a race with
-+		 * a timer firing now getting the old leader, so we need to
-+		 * synchronize with any firing (by calling del_timer_sync)
-+		 * before we can safely let the old group leader die.
-+		 */
-+		sig->real_timer.data = (unsigned long)current;
-+		if (del_timer_sync(&sig->real_timer))
-+			add_timer(&sig->real_timer);
-+	}
- 	while (atomic_read(&sig->count) > count) {
- 		sig->group_exit_task = current;
- 		sig->notify_count = count;

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-07-31 19:44:25 UTC (rev 3650)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-01 00:52:45 UTC (rev 3651)
@@ -30,5 +30,4 @@
 + arch-x86_64-mm-mmap.dpatch
 + arch-ia64-ptrace-getregs-putregs.dpatch
 + arch-ia64-ptrace-restore_sigcontext.dpatch
-+ fs-exec-real_timer-reset.dpatch
 + Makefile-gcc-3.3.dpatch