From: Greg Kroah-Hartman Date: Fri, 20 Mar 2009 21:49:21 +0000 (-0700) Subject: another .28 patch X-Git-Tag: v2.6.28.9~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e839318817fd9d79da9e42f8b79bae0617fbf031;p=thirdparty%2Fkernel%2Fstable-queue.git another .28 patch --- diff --git a/queue-2.6.28/menu-fix-embedded-menu-snafu.patch b/queue-2.6.28/menu-fix-embedded-menu-snafu.patch new file mode 100644 index 00000000000..7176d9bc23a --- /dev/null +++ b/queue-2.6.28/menu-fix-embedded-menu-snafu.patch @@ -0,0 +1,84 @@ +From b943c460ff8556a193b28e2145b513f8b978e869 Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Tue, 10 Mar 2009 12:55:46 -0700 +Subject: menu: fix embedded menu snafu + +From: Randy Dunlap + +commit b943c460ff8556a193b28e2145b513f8b978e869 upstream. + +The COMPAT_BRK kconfig symbol does not depend on EMBEDDED, but it is in +the midst of the EMBEDDED menu symbols, so it mucks up the EMBEDDED menu. +Fix by moving it to just after all of the EMBEDDED menu symbols. Also, +ANON_INODES has a similar problem, so move it to just above the EMBEDDED +menu items since it is used in the EMBEDDED menu. + +Signed-off-by: Randy Dunlap +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + init/Kconfig | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -538,6 +538,9 @@ config CC_OPTIMIZE_FOR_SIZE + config SYSCTL + bool + ++config ANON_INODES ++ bool ++ + menuconfig EMBEDDED + bool "Configure standard kernel features (for small systems)" + help +@@ -643,18 +646,6 @@ config PCSPKR_PLATFORM + This option allows to disable the internal PC-Speaker + support, saving some memory. + +-config COMPAT_BRK +- bool "Disable heap randomization" +- default y +- help +- Randomizing heap placement makes heap exploits harder, but it +- also breaks ancient binaries (including anything libc5 based). +- This option changes the bootup default to heap randomization +- disabled, and can be overriden runtime by setting +- /proc/sys/kernel/randomize_va_space to 2. +- +- On non-ancient distros (post-2000 ones) N is usually a safe choice. +- + config BASE_FULL + default y + bool "Enable full-sized data structures for core" if EMBEDDED +@@ -672,9 +663,6 @@ config FUTEX + support for "fast userspace mutexes". The resulting kernel may not + run glibc-based applications correctly. + +-config ANON_INODES +- bool +- + config EPOLL + bool "Enable eventpoll support" if EMBEDDED + default y +@@ -760,6 +748,18 @@ config SLUB_DEBUG + SLUB sysfs support. /sys/slab will not exist and there will be + no support for cache validation etc. + ++config COMPAT_BRK ++ bool "Disable heap randomization" ++ default y ++ help ++ Randomizing heap placement makes heap exploits harder, but it ++ also breaks ancient binaries (including anything libc5 based). ++ This option changes the bootup default to heap randomization ++ disabled, and can be overriden runtime by setting ++ /proc/sys/kernel/randomize_va_space to 2. ++ ++ On non-ancient distros (post-2000 ones) N is usually a safe choice. ++ + choice + prompt "Choose SLAB allocator" + default SLUB diff --git a/queue-2.6.28/series b/queue-2.6.28/series index c5b501469a0..1ccc3fcd5f0 100644 --- a/queue-2.6.28/series +++ b/queue-2.6.28/series @@ -40,3 +40,4 @@ drm-i915-don-t-enable-vblanks-on-disabled-pipes.patch drm-i915-don-t-double-unpin-buffers-if-we-take-a-signal-in-evict_everything.patch drm-i915-don-t-print-to-dmesg-when-taking-signal-during-object_pin.patch drm-i915-don-t-allow-objects-to-get-bound-while-vt-switched.patch +menu-fix-embedded-menu-snafu.patch