r2714 - in trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8: config debian

[Dann Frazier]

Author: dannf
Date: 2005-03-14 21:21:07 +0100 (Mon, 14 Mar 2005)
New Revision: 2714

Modified:
   trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/default
   trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium
   trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium-smp
   trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley
   trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley-smp
   trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/changelog
   trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/control
Log:
disable preempt; which was shown to reproducibly cause oopsing on ia64 boxes

Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/default
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/default	2005-03-14 20:11:32 UTC (rev 2713)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/default	2005-03-14 20:21:07 UTC (rev 2714)
@@ -75,8 +75,7 @@
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
 # CONFIG_SMP is not set
-CONFIG_PREEMPT=y
-CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_PREEMPT is not set
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_PERFMON=y

Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium	2005-03-14 20:11:32 UTC (rev 2713)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium	2005-03-14 20:21:07 UTC (rev 2714)
@@ -75,8 +75,7 @@
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
 # CONFIG_SMP is not set
-CONFIG_PREEMPT=y
-CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_PREEMPT is not set
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_PERFMON=y

Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium-smp
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium-smp	2005-03-14 20:11:32 UTC (rev 2713)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium-smp	2005-03-14 20:21:07 UTC (rev 2714)
@@ -75,8 +75,7 @@
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
 # CONFIG_SMP is not set
-CONFIG_PREEMPT=y
-CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_PREEMPT is not set
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_PERFMON=y

Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley	2005-03-14 20:11:32 UTC (rev 2713)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley	2005-03-14 20:21:07 UTC (rev 2714)
@@ -75,8 +75,7 @@
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
 # CONFIG_SMP is not set
-CONFIG_PREEMPT=y
-CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_PREEMPT is not set
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_PERFMON=y

Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley-smp
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley-smp	2005-03-14 20:11:32 UTC (rev 2713)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley-smp	2005-03-14 20:21:07 UTC (rev 2714)
@@ -75,8 +75,7 @@
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
 # CONFIG_SMP is not set
-CONFIG_PREEMPT=y
-CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_PREEMPT is not set
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_PERFMON=y

Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/changelog	2005-03-14 20:11:32 UTC (rev 2713)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/changelog	2005-03-14 20:21:07 UTC (rev 2714)
@@ -2,7 +2,10 @@
 
   * Rebuild against kernel-tree-2.6.8-14
   * Change maintainer to kernel team, and add me as an uploader
-  * Disable JFS, which would otherwise oops on mount - see #292050.
+  * Disable JFS, which would otherwise oops on mount - see #292050
+  * Turn off CONFIG_PREEMPT, and change the ABI number to reflect the
+    change.  This disables a potential DoS attack vector (which is not
+    reproducible in later 2.6 kernels).
 
  -- dann frazier <dannf@debian.org>  Mon, 14 Mar 2005 11:44:40 -0700
 

Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/control
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/control	2005-03-14 20:11:32 UTC (rev 2713)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/control	2005-03-14 20:21:07 UTC (rev 2714)
@@ -6,7 +6,7 @@
 Standards-Version: 3.6.1
 Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.8-14, module-init-tools
 
-Package: kernel-headers-2.6.8-2
+Package: kernel-headers-2.6.8-3
 Architecture: ia64
 Section: devel
 Priority: optional
@@ -15,31 +15,31 @@
 Description: Header files related to Linux kernel version 2.6.8
  This package provides kernel header files for version 2.6.8, for sites 
  that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.6.8-2/debian.README.gz for details.
+ /usr/share/doc/kernel-headers-2.6.8-3/debian.README.gz for details.
 
-Package: kernel-headers-2.6.8-2-itanium
+Package: kernel-headers-2.6.8-3-itanium
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-2
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-3
 Provides: kernel-headers, kernel-headers-2.6
 Description: Linux kernel headers 2.6.8 on Itanium
  This package provides kernel header files for version 2.6.8 on
  Itanium,
  for sites that want the latest kernel headers.
- Please read /usr/share/doc/kernel-headers-2.6.8-2-itanium/debian.README.gz for
+ Please read /usr/share/doc/kernel-headers-2.6.8-3-itanium/debian.README.gz for
  details.
 
 Package: kernel-headers-2.6-itanium
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: kernel-headers-2.6.8-2-itanium
+Depends: kernel-headers-2.6.8-3-itanium
 Description: Linux kernel headers 2.6 on Itanium
  This package will always depend on the latest 2.6 kernel headers available
  for Itanium.
 
-Package: kernel-image-2.6.8-2-itanium
+Package: kernel-image-2.6.8-3-itanium
 Architecture: ia64
 Section: base
 Priority: optional
@@ -62,16 +62,16 @@
 Architecture: ia64
 Section: base
 Priority: optional
-Depends: kernel-image-2.6.8-2-itanium
+Depends: kernel-image-2.6.8-3-itanium
 Description: Linux kernel image for version 2.6 on Itanium
  This package will always depend on the latest 2.6 kernel image available
  for Itanium.
 
-Package: kernel-headers-2.6.8-2-itanium-smp
+Package: kernel-headers-2.6.8-3-itanium-smp
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-2
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-3
 Provides: kernel-headers, kernel-headers-2.6
 Description: Linux kernel headers 2.6.8 on Itanium SMP
  This package provides kernel header files for version 2.6.8 on
@@ -79,20 +79,20 @@
  for sites that want the latest kernel headers.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
  Please read
- /usr/share/doc/kernel-headers-2.6.8-2-itanium-smp/debian.README.gz for
+ /usr/share/doc/kernel-headers-2.6.8-3-itanium-smp/debian.README.gz for
  details.
 
 Package: kernel-headers-2.6-itanium-smp
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: kernel-headers-2.6.8-2-itanium-smp
+Depends: kernel-headers-2.6.8-3-itanium-smp
 Description: Linux kernel headers 2.6 on Itanium SMP
  This package will always depend on the latest 2.6 kernel headers available
  for Itanium with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
-Package: kernel-image-2.6.8-2-itanium-smp
+Package: kernel-image-2.6.8-3-itanium-smp
 Architecture: ia64
 Section: base
 Priority: optional
@@ -116,36 +116,36 @@
 Architecture: ia64
 Section: base
 Priority: optional
-Depends: kernel-image-2.6.8-2-itanium-smp
+Depends: kernel-image-2.6.8-3-itanium-smp
 Description: Linux kernel image for version 2.6 on Itanium SMP
  This package will always depend on the latest 2.6 kernel image available
  for Itanium with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
-Package: kernel-headers-2.6.8-2-mckinley
+Package: kernel-headers-2.6.8-3-mckinley
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-2
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-3
 Provides: kernel-headers, kernel-headers-2.6
 Description: Linux kernel headers 2.6.8 on Itanium II
  This package provides kernel header files for version 2.6.8 on
  Itanium II (also known as McKinley),
  for sites that want the latest kernel headers.
  Please read
- /usr/share/doc/kernel-headers-2.6.8-2-mckinley/debian.README.gz for
+ /usr/share/doc/kernel-headers-2.6.8-3-mckinley/debian.README.gz for
  details.
 
 Package: kernel-headers-2.6-mckinley
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: kernel-headers-2.6.8-2-mckinley
+Depends: kernel-headers-2.6.8-3-mckinley
 Description: Linux kernel headers 2.6 on Itanium II
  This package will always depend on the latest 2.6 kernel headers available
  for Itanium II (also known as McKinley).
 
-Package: kernel-image-2.6.8-2-mckinley
+Package: kernel-image-2.6.8-3-mckinley
 Architecture: ia64
 Section: base
 Priority: optional
@@ -168,16 +168,16 @@
 Architecture: ia64
 Section: base
 Priority: optional
-Depends: kernel-image-2.6.8-2-mckinley
+Depends: kernel-image-2.6.8-3-mckinley
 Description: Linux kernel image for version 2.6 on Itanium II
  This package will always depend on the latest 2.6 kernel image available
  for Itanium II (also known as McKinley).
 
-Package: kernel-headers-2.6.8-2-mckinley-smp
+Package: kernel-headers-2.6.8-3-mckinley-smp
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-2
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-3
 Provides: kernel-headers, kernel-headers-2.6
 Description: Linux kernel headers 2.6.8 on Itanium II SMP
  This package provides kernel header files for version 2.6.8 on
@@ -185,20 +185,20 @@
  for sites that want the latest kernel headers.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
  Please read
- /usr/share/doc/kernel-headers-2.6.8-2-mckinley-smp/debian.README.gz for
+ /usr/share/doc/kernel-headers-2.6.8-3-mckinley-smp/debian.README.gz for
  details.
 
 Package: kernel-headers-2.6-mckinley-smp
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: kernel-headers-2.6.8-2-mckinley-smp
+Depends: kernel-headers-2.6.8-3-mckinley-smp
 Description: Linux kernel headers 2.6 on Itanium II SMP
  This package will always depend on the latest 2.6 kernel headers available
  for Itanium II (also known as McKinley) with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
-Package: kernel-image-2.6.8-2-mckinley-smp
+Package: kernel-image-2.6.8-3-mckinley-smp
 Architecture: ia64
 Section: base
 Priority: optional
@@ -222,7 +222,7 @@
 Architecture: ia64
 Section: base
 Priority: optional
-Depends: kernel-image-2.6.8-2-mckinley-smp
+Depends: kernel-image-2.6.8-3-mckinley-smp
 Description: Linux kernel image for version 2.6 on Itanium II SMP
  This package will always depend on the latest 2.6 kernel image available
  for Itanium II (also known as McKinley) with SMP support.