r2534 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-02-23 02:56:43 +0100 (Wed, 23 Feb 2005)
New Revision: 2534

Added:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/setsid-race-2.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
Log:
Fix build problem introduced by 
CAN-2005-0178 fix

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-02-22 15:26:05 UTC (rev 2533)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-02-23 01:56:43 UTC (rev 2534)
@@ -21,14 +21,15 @@
 
   * nls-table-overflow.dpatch: [CAN-2005-0177] NLS ASCII table should be 256
     entries, not 128! (Joshua Kwan)
-  
-  * setsid-race.dpatch: [CAN-2005-0178] fix setsid() race that could lead
-    to a denial of service. (Joshua Kwan)
 
+  * setsid-race.dpatch, setsid-race-2.dpatch:
+    [CAN-2005-0178] fix setsid() race that could lead to a denial of service.
+    (Joshua Kwan, Simon Horman)
+
   * ipv4-fragment-queues.dpatch: fix potential information leak by making
     fragment queues private. (Joshua Kwan)
 
- -- Joshua Kwan <joshk@triplehelix.org>  Fri, 18 Feb 2005 18:14:38 -0800
+ -- Simon Horman <horms@debian.org>  Wed, 23 Feb 2005 10:55:52 +0900
 
 kernel-source-2.6.10 (2.6.10-5) unstable; urgency=low
 

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6	2005-02-22 15:26:05 UTC (rev 2533)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6	2005-02-23 01:56:43 UTC (rev 2534)
@@ -3,5 +3,6 @@
 + sparc64-nis-killer.dpatch
 + sparc32-hypersparc-srmmu.dpatch
 + setsid-race.dpatch
++ setsid-race-2.dpatch
 + ipv4-fragment-queues.dpatch
 + nls-table-overflow.dpatch

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/setsid-race-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/setsid-race-2.dpatch	2005-02-22 15:26:05 UTC (rev 2533)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/setsid-race-2.dpatch	2005-02-23 01:56:43 UTC (rev 2534)
@@ -0,0 +1,51 @@
+# origin: jgarzik (BitKeeper)
+# cset: 1.1966.27.2 (2.6) key=41deb8dbtBo-XheRdYFJvHQdoWvMaA
+# URL: http://linux.bkbits.net:8080/linux-2.6/gnupatch@41deb8dbtBo-XheRdYFJvHQdoWvMaA
+# inclusion: upstream
+# descrition: [PATCH] x86-64: kernel/sys.c build fix
+# revision date: Wed, 23 Feb 2005 10:51:48 +0900
+#
+# S rset: ChangeSet|1.1966.27.1..1.1966.27.2
+# I rset: kernel/sys.c|1.101..1.102
+#
+# Key:
+# S: Skipped  ChangeSet file only
+# O: Original Followed by Updated
+# U: Updated  Included with updated range of versions
+# I: Included Included verbatim
+# E: Excluded Excluded on request from user
+# D: Deleted  Manually deleted by subsequent user edit
+# R: Revised  Manually revised by subsequent user edit
+#
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/01/07 08:29:15-08:00 jgarzik@pobox.com 
+#   [PATCH] x86-64: kernel/sys.c build fix
+#   
+#   On x86-64, the attached patch is required to fix
+#   
+#   > kernel/sys.c: In function `sys_setsid':
+#   > kernel/sys.c:1078: error: `tty_sem' undeclared (first use in this function)
+#   > kernel/sys.c:1078: error: (Each undeclared identifier is reported only once
+#   > kernel/sys.c:1078: error: for each function it appears in.)
+#   
+#   kernel/sys.c needs the tty_sem declaration from linux/tty.h.
+# 
+# kernel/sys.c
+#   2005/01/06 23:25:46-08:00 jgarzik@pobox.com +1 -0
+#   x86-64: kernel/sys.c build fix
+# 
+#
+===== kernel/sys.c 1.101 vs 1.102 =====
+--- 1.101/kernel/sys.c	2005-01-05 03:47:32 +09:00
++++ 1.102/kernel/sys.c	2005-01-07 16:25:46 +09:00
+@@ -23,6 +23,7 @@
+ #include <linux/security.h>
+ #include <linux/dcookies.h>
+ #include <linux/suspend.h>
++#include <linux/tty.h>
+ 
+ #include <linux/compat.h>
+ #include <linux/syscalls.h>