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

[Simon Horman]

Author: horms
Date: 2005-06-30 04:31:37 +0000 (Thu, 30 Jun 2005)
New Revision: 3410

Removed:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-exec-reparent-timers.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 does not seem to be vulnerable to
CAN-2005-1913, as it does not include per-process timers, which
was introduced by this patch

http://linux.bkbits.net:8080/linux-2.6/cset@422dec29xUKSbBfNLEKytSf8w6XHhA


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-06-29 09:17:55 UTC (rev 3409)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-06-30 04:31:37 UTC (rev 3410)
@@ -51,12 +51,6 @@
     Make exec clean up posix timers.
     (Simon Horman)
 
-  * [SECURITY] fs-exec-reparent-timers.dpatch
-    Make sure we re-parent itimers.  If subthread exec's with timer pending,
-    signal is delivered to old group-leader and can panic kernel.
-    See CAN-2005-1913.
-    (Simon Horman)
-
   * fs-hfs-oops-and-leak.dpatch
     Fix a leak in HFS and HFS+
     Fix an oops that occurs when an attempt is made to
@@ -116,7 +110,7 @@
   * net-ipv4-ipvs-conn_tab-race.dpatch
     Fix race condition on p_vs_conn_tab list modification
 
- -- Simon Horman <horms@debian.org>  Wed, 29 Jun 2005 18:15:05 +0900
+ -- Simon Horman <horms@debian.org>  Thu, 30 Jun 2005 13:30:50 +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-reparent-timers.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-exec-reparent-timers.dpatch	2005-06-29 09:17:55 UTC (rev 3409)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-exec-reparent-timers.dpatch	2005-06-30 04:31:37 UTC (rev 3410)
@@ -1,33 +0,0 @@
-commit fe3d5c8793fcaf33c5d3118a7f3ffc135eadaf4d
-tree 19fac0a8a24b4c106babdfee1e68b5e794ece216
-parent 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab
-author Linus Torvalds <torvalds@osdl.org> 1119125869 -0700
-committer Chris Wright <chrisw@osdl.org> 1119468770 -0700
-
-[PATCH] Clean up subthread exec (CAN-2005-1913)
-
-Make sure we re-parent itimers.  If subthread exec's with timer pending,
-signal is delivered to old group-leader and can panic kernel.
-
-Signed-off-by: Linus Torvalds <torvalds@ppc970.osdl.org>
-Signed-off-by: Chris Wright <chrisw@osdl.org>
-
-I:100644 100644 e56ee24370255e2ab4df9a3933ec03f0d07a2de3 422cc0ec5e366b846336a22398ddc019ca6212c2 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
-
-diff --git a/fs/exec.c b/fs/exec.c
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -649,6 +649,7 @@ static inline int de_thread(struct task_
- 	}
- 	sig->group_exit_task = NULL;
- 	sig->notify_count = 0;
-+	sig->real_timer.data = (unsigned long)current;
- 	spin_unlock_irq(lock);
- 
- 	/*

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-06-29 09:17:55 UTC (rev 3409)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-06-30 04:31:37 UTC (rev 3410)
@@ -10,7 +10,6 @@
 + fs-exec-ptrace-deadlock.dpatch
 + fs-exec-posix-timers-leak-1.dpatch
 + fs-exec-posix-timers-leak-2.dpatch
-+ fs-exec-reparent-timers.dpatch
 + fs-hfs-oops-and-leak.dpatch
 + fs-jbd-checkpoint-assertion.dpatch
 #+ mm-mmap-range-test.dpatch