r1903 - in trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian: . patches patches/series

[Andres Salomon]

Author: dilinger-guest
Date: 2004-11-24 22:50:17 -0700 (Wed, 24 Nov 2004)
New Revision: 1903

Added:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/tty-locking-fixes9.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-3
Log:
grab joshk's tty locking fix from -10


Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-11-25 05:36:26 UTC (rev 1902)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-11-25 05:50:17 UTC (rev 1903)
@@ -8,6 +8,12 @@
 
   * [SECURITY] s390: sacf local root exploit (CAN-2004-0887) (Andres Salomon).
 
+  * [SECURITY] Further smbfs overflow fixes, stolen from -ac tree
+    (Andres Salomon).
+
+  * Add missing check for tty == NULL in uart_tasklet_action to fix an init
+    oops on serial console. (Joshua Kwan)
+
  -- Andres Salomon <dilinger@voxel.net>  Thu, 25 Nov 2004 00:20:47 -0500
 
 kernel-source-2.6.9 (2.6.9-2) unstable; urgency=low

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-3	2004-11-25 05:36:26 UTC (rev 1902)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-3	2004-11-25 05:50:17 UTC (rev 1903)
@@ -2,3 +2,6 @@
 + elf-loader-fixes-the-return.dpatch
 + aout-loader-fixes.dpatch
 + s390-sacf-fix.dpatch
+- smbfs-overrun.dpatch
++ smbfs-overflow-fixes.dpatch
++ tty-locking-fixes9.dpatch

Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/tty-locking-fixes9.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/tty-locking-fixes9.dpatch	2004-11-25 05:36:26 UTC (rev 1902)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/tty-locking-fixes9.dpatch	2004-11-25 05:50:17 UTC (rev 1903)
@@ -0,0 +1,12 @@
+--- kernel-source-2.6.8-2.6.8/drivers/serial/serial_core.c~	2004-11-24 11:56:39.000000000 -0800
++++ kernel-source-2.6.8-2.6.8/drivers/serial/serial_core.c	2004-11-24 11:56:50.000000000 -0800
+@@ -107,7 +107,8 @@
+ static void uart_tasklet_action(unsigned long data)
+ {
+ 	struct uart_state *state = (struct uart_state *)data;
+-	tty_wakeup(state->info->tty);
++	if (state->info->tty)
++		tty_wakeup(state->info->tty);
+ }
+ 
+ static inline void