From 16c93697933ccea3dc40ce0cf0db9845a6cfd0b3 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Thu, 20 Mar 2008 14:17:26 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/config: Revert SECURITY_DEFAULT_MMAP_MIN_ADDR to 0 which is upstream default setting. svn path=/dists/trunk/linux-2.6/; revision=10927 --- debian/changelog | 2 -- debian/config/config | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c57f8ed11..4a98a8825 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,8 +32,6 @@ linux-2.6 (2.6.25~rc6-1~experimental.1) UNRELEASED; urgency=low * Tighten yaird dependency. (closes: #403171) * Configs general cleanup, centralize USB_NET, disable IRDA_DEBUG. * postinst: Nuke confusing postinst message. (closes: #465512) - * [SECURITY]: Set DEFAULT_MMAP_MIN_ADDR to 65536 enabling low address space - protection from user allocation - /proc/sys/vm/mmap_min_addr tunable. * [sparc]: Enable SCSI_SCAN_ASYNC. * [i386]: Enable TC1100_WMI, SND_SIS7019, CRYPTO_SALSA20_586. * topconfig: Centralize old IEEE80211 stack options. (closes: #470558) diff --git a/debian/config/config b/debian/config/config index bf337f983..85ac41207 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2376,7 +2376,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y CONFIG_SECURITY_FILE_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 ## ## file: security/selinux/Kconfig