summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-02-04 02:15:32 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2014-02-05 14:59:14 +0000
commit530b099dfe8499d639e7fbcad28c4199e2a720c7 (patch)
tree84270102fb52b6db443ca1912289421958c0f910
parent6290b53de025dd08a79257ee84173ef7b6d926f7 (diff)
downloadlinux-stable-530b099dfe8499d639e7fbcad28c4199e2a720c7.tar.gz
linux-stable-530b099dfe8499d639e7fbcad28c4199e2a720c7.tar.bz2
linux-stable-530b099dfe8499d639e7fbcad28c4199e2a720c7.zip
security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64
Binaries compiled for arm may run on arm64 if CONFIG_COMPAT is selected. Set LSM_MMAP_MIN_ADDR to 32768 if ARM64 && COMPAT to prevent selinux failures launching 32-bit static executables that are mapped at 0x8000. Signed-off-by: Colin Cross <ccross@android.com> Acked-by: Will Deacon <will.deacon@arm.com> Acked-by: Eric Paris <eparis@redhat.com> Acked-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--security/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/Kconfig b/security/Kconfig
index e9c6ac724fef..beb86b500adf 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -103,7 +103,7 @@ config INTEL_TXT
config LSM_MMAP_MIN_ADDR
int "Low address space for LSM to protect from user allocation"
depends on SECURITY && SECURITY_SELINUX
- default 32768 if ARM
+ default 32768 if ARM || (ARM64 && COMPAT)
default 65536
help
This is the portion of low virtual memory which should be protected