[kernel] r14420 - in dists/trunk/linux-2.6/debian: . config config/ia64 config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Tue Oct 20 08:23:10 2009
New Revision: 14420

Log:
topconfig set LSM_MMAP_MIN_ADDR to redcommended 32768

for x86_32 to zero, for x86_64 and ia64 to 65536.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Oct 20 02:39:18 2009	(r14419)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Oct 20 08:23:10 2009	(r14420)
@@ -14,7 +14,8 @@
   * [alpha] Disable SND_MIXART, causes gcc ICE.
   * [x86] Enable modular X86_MCE_INJECT.
   * [x86_64] Set LOG_BUF_SHIFT to 2^18.
-  * Set LSM_MMAP_MIN_ADDR to zero to unbreak dosemu and 16-bit Wine.
+  * [x86_32] Set LSM_MMAP_MIN_ADDR to zero to unbreak dosemu and 16-bit Wine,
+    ia64 and x86_64 to 65536 otherwise default to 32768.
   * Unset UEVENT_HELPER_PATH to save some boot cycles.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Oct 2009 02:18:40 +0100

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Oct 20 02:39:18 2009	(r14419)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Oct 20 08:23:10 2009	(r14420)
@@ -3684,7 +3684,7 @@
 # CONFIG_SECURITY_PATH is not set
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_LSM_MMAP_MIN_ADDR=32768
 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Tue Oct 20 02:39:18 2009	(r14419)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Tue Oct 20 08:23:10 2009	(r14420)
@@ -843,6 +843,11 @@
 CONFIG_IRNET=m
 
 ##
+## file: security/Kconfig
+##
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+
+##
 ## file: sound/Kconfig
 ##
 CONFIG_SOUND=y

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Oct 20 02:39:18 2009	(r14419)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Oct 20 08:23:10 2009	(r14420)
@@ -93,3 +93,7 @@
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
 
+##
+## file: security/Kconfig
+##
+CONFIG_LSM_MMAP_MIN_ADDR=0

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Tue Oct 20 02:39:18 2009	(r14419)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Tue Oct 20 08:23:10 2009	(r14420)
@@ -68,3 +68,7 @@
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_MIGRATION=y
 
+##
+## file: security/Kconfig
+##
+CONFIG_LSM_MMAP_MIN_ADDR=65536