aboutsummaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authordcashman <dcashman@google.com>2015-10-02 12:52:57 -0700
committerMark Salyzyn <salyzyn@google.com>2015-10-28 14:31:17 +0000
commit565ef50330f97868b8d01b78c7809e453679ba76 (patch)
treed2ae195b5e03750ba685a8430f86e0fcdc1f3bbd /kernel/sysctl.c
parent70f767ae180a8b7ab0058145ed5375bc357a39a6 (diff)
mm: mmap: Add new /proc tunable for mmap_base ASLR.
ASLR currently only uses 8 bits to generate the random offset for the mmap base address on 32 bit architectures. This value was chosen to prevent a poorly chosen value from dividing the address space in such a way as to prevent large allocations. This may not be an issue on all platforms. Allow the specification of a minimum number of bits so that platforms desiring greater ASLR protection may determine where to place the trade-off. BUG=24047224 Signed-off-by: Daniel Cashman <dcashman@google.com> Change-Id: I0aa8f1e416fec848b6817ab861610d8f0eb3beb8
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 78af9692e0a4..a6de89ef2191 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1106,6 +1106,17 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
#endif
+#ifdef CONFIG_ARCH_MMAP_RND_BITS
+ {
+ .procname = "mmap_rnd_bits",
+ .data = &mmap_rnd_bits,
+ .maxlen = sizeof(mmap_rnd_bits),
+ .mode = 0644,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = &mmap_rnd_bits_min,
+ .extra2 = &mmap_rnd_bits_max,
+ },
+#endif
{ }
};