r1947 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2004-11-29 04:04:05 -0700 (Mon, 29 Nov 2004)
New Revision: 1947

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/093_tty_lockup-2.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
Log:
Fixed alpha/mips compile problem caused by tty_lockup fix

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-11-28 13:18:18 UTC (rev 1946)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-11-29 11:04:05 UTC (rev 1947)
@@ -16,7 +16,7 @@
   * 092_sparc64_hme_lockup.diff:
     Add workaround for broken Happy Meal ethernet controllers.
     (Closes: #275485) (Simon Horman)
-  * 093_tty_lockup.diff:
+  * 093_tty_lockup.diff, 093_tty_lockup-2.diff:
     Security: fix race conditions in linux terminal subsystem
     [CAN-2004-0814] (Closes: #277681) (Simon Horman)
   * 094_menuconfig_crash.diff

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/093_tty_lockup-2.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/093_tty_lockup-2.diff	2004-11-28 13:18:18 UTC (rev 1946)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/093_tty_lockup-2.diff	2004-11-29 11:04:05 UTC (rev 1947)
@@ -0,0 +1,15 @@
+# origin: debian-kernel@lists.debian.org, Norbert Tretkowski <tretkowski@inittab.de>
+# cset: n/a
+# inclusion: unknown, presumably will be included
+# revision date: 2004-11-29
+# description: Add missing variable for CAN-2004-081 fix
+--- a/drivers/char/tty_ioctl.c	2004-11-26 09:01:12.000000000 +0100
++++ b/drivers/char/tty_ioctl.c	2004-11-27 01:28:37.000000000 +0100
+@@ -286,6 +286,7 @@
+ 	int retval;
+ 	struct sgttyb tmp;
+ 	struct termios termios;
++	unsigned long flags;
+ 
+ 	retval = tty_check_change(tty);
+ 	if (retval)

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6	2004-11-28 13:18:18 UTC (rev 1946)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6	2004-11-29 11:04:05 UTC (rev 1947)
@@ -20,6 +20,7 @@
 + 091_disambiguate_sym53c8xx.diff
 + 092_sparc64_hme_lockup.diff
 + 093_tty_lockup.diff
++ 093_tty_lockup-2.diff
 + 094_menuconfig_crash.diff
 + 095_sparc32_initrd_memcpy.diff
 + 096_megaraid2_proc_name.diff