|author||Ingo Molnar <firstname.lastname@example.org>||2009-09-02 08:17:56 +0200|
|committer||Ingo Molnar <email@example.com>||2009-09-02 08:17:56 +0200|
Merge commit 'v2.6.31-rc8' into x86/txt
Conflicts: arch/x86/kernel/reboot.c security/Kconfig Merge reason: resolve the conflicts, bump up from rc3 to rc8. Signed-off-by: Ingo Molnar <firstname.lastname@example.org>
Diffstat (limited to 'security/Kconfig')
1 files changed, 16 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig
index 5721847a7a6..fb363cd81cf 100644
@@ -143,6 +143,22 @@ config INTEL_TXT
If you are unsure as to whether this is required, answer N.
+ int "Low address space for LSM to protect from user allocation"
+ depends on SECURITY && SECURITY_SELINUX
+ default 65536
+ This is the portion of low virtual memory which should be protected
+ from userspace allocation. Keeping a user from writing to low pages
+ can help reduce the impact of kernel NULL pointer bugs.
+ For most ia64, ppc64 and x86 users with lots of address space
+ a value of 65536 is reasonable and should cause no problems.
+ On arm and other archs it should not be higher than 32768.
+ Programs which use vm86 functionality or have some need to map
+ this low address space will need the permission specific to the
+ systems running LSM.