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

[Simon Horman]

Author: horms
Date: 2005-07-29 04:00:19 +0000 (Fri, 29 Jul 2005)
New Revision: 3622

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/arch-x86_64-mm-mmap.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:
x86_64: Compat mode program can hang kernel. See CAN-2005-1765.

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-29 03:47:02 UTC (rev 3621)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-07-29 04:00:19 UTC (rev 3622)
@@ -131,8 +131,12 @@
     an lead to a local DoS.
     See CAN-2005-0757. (see: #311164). (Simon Horman)
 
- -- Simon Horman <horms at debian.org>  Fri, 29 Jul 2005 12:17:01 +0900
+  * arch-x86_64-mm-mmap.dpatch
+    x86_64: Compat mode program can hang kernel
+    See CAN-2005-1765. (Simon Horman)
 
+ -- Simon Horman <horms at debian.org>  Fri, 29 Jul 2005 12:51:35 +0900
+
 kernel-source-2.6.8 (2.6.8-16) unstable; urgency=low
 
   * smbfs-overrun.dpatch:

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/arch-x86_64-mm-mmap.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/arch-x86_64-mm-mmap.dpatch	2005-07-29 03:47:02 UTC (rev 3621)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/arch-x86_64-mm-mmap.dpatch	2005-07-29 04:00:19 UTC (rev 3622)
@@ -0,0 +1,16 @@
+# source: Ubuntu linux-source-2.6.8.1 2.6.8.1-16.20
+# inclusion: included, though code has been reworked
+# descrition: x86_64: Compat mode program can hang kernel
+# revision date: Fri, 29 Jul 2005 12:51:02 +0900
+
+--- kernel-source-2.6.8/arch/x86_64/mm/fault.c	2004-08-14 14:36:11.000000000 +0900
++++ kernel-source-2.6.8/arch/x86_64/mm/fault.c	2005-07-29 12:41:10.000000000 +0900
+@@ -352,7 +352,7 @@
+ 
+ #ifdef CONFIG_IA32_EMULATION
+ 		/* 32bit vsyscall. map on demand. */
+-		if (test_thread_flag(TIF_IA32) && 
++		if (test_thread_flag(TIF_IA32) && ((error_code & 0x6) == 0x4) &&
+ 	    address >= 0xffffe000 && address < 0xffffe000 + PAGE_SIZE) { 
+ 			if (map_syscall32(mm, address) < 0) 
+ 				goto out_of_memory2;

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-29 03:47:02 UTC (rev 3621)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-07-29 04:00:19 UTC (rev 3622)
@@ -27,3 +27,4 @@
 + drivers-acpi-pci_irq-elcr.dpatch
 + net-netlink-autobind-return.dpatch
 + fs-ext3-64bit-offset.dpatch
++ arch-x86_64-mm-mmap.dpatch