summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorRadu Caragea <sinaelgl@gmail.com>2013-08-13 16:00:59 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-20 08:43:02 -0700
commitf6c19e2f7d9204bca6576f03a117bec4eaaa9b5b (patch)
treea91b97087847cd76f1ae7906ca0f4430a13177d4 /include/linux
parent4f01c72ef36d3305d6273fe7f1f6670c52745c3d (diff)
downloadlinux-3.10-f6c19e2f7d9204bca6576f03a117bec4eaaa9b5b.tar.gz
linux-3.10-f6c19e2f7d9204bca6576f03a117bec4eaaa9b5b.tar.bz2
linux-3.10-f6c19e2f7d9204bca6576f03a117bec4eaaa9b5b.zip
x86 get_unmapped_area(): use proper mmap base for bottom-up direction
commit df54d6fa54275ce59660453e29d1228c2b45a826 upstream. When the stack is set to unlimited, the bottomup direction is used for mmap-ings but the mmap_base is not used and thus effectively renders ASLR for mmapings along with PIE useless. Reviewed-by: Rik van Riel <riel@redhat.com> Cc: Michel Lespinasse <walken@google.com> Cc: Oleg Nesterov <oleg@redhat.com> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: Adrian Sendroiu <molecula2788@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sched.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 178a8d909f1..3aeb14b0624 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -314,6 +314,7 @@ struct nsproxy;
struct user_namespace;
#ifdef CONFIG_MMU
+extern unsigned long mmap_legacy_base(void);
extern void arch_pick_mmap_layout(struct mm_struct *mm);
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,