From: Michal Hocko <mhocko@suse.cz>
To: Ingo Molnar <mingo@redhat.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
"H . Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Jiri Kosina <jkosina@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v2] x86: increase MIN_GAP to include randomized stack
Date: Fri, 4 Sep 2009 11:37:00 +0200 [thread overview]
Message-ID: <1252057020-5207-1-git-send-email-mhocko@suse.cz> (raw)
Currently we are not including randomized stack size when calculating
mmap_base address in arch_pick_mmap_layout for topdown case. This might
cause that mmap_base starts in the stack reserved area because stack is
randomized by 1GB for 64b (8MB for 32b) and the minimum gap is 128MB.
If the stack really grows down to mmap_base then we can get silent mmap
region overwrite by the stack values.
Let's include maximum stack randomization size into MIN_GAP which is
used as the low bound for the gap in mmap.
Signed-off-by: Michal Hocko <mhocko@suse.cz>
---
arch/x86/mm/mmap.c | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
I wasn't sure about STACK_RND_MASK because it is defined also in
arch/x86/include/asm/elf.h and I couldn't find a common header file for
both of them. If you have any idea I would like to help with that.
Or should we just let it for later cleanup?
I think that this is also stable material and I will repost it to
stable@kernel.org once you ack it.
Changes from v1:
Fixed unsigned int overflow in MIN_GAP calculation.
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
index 1658296..ac41955 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -30,12 +30,29 @@
#include <linux/limits.h>
#include <linux/sched.h>
+/* 1GB for 64bit, 8MB for 32bit definition taken from arch/x86/include/asm/elf.h */
+#ifndef STACK_RND_MASK
+#define STACK_RND_MASK (test_thread_flag(TIF_IA32) ? 0x7ff : 0x3fffff)
+#endif
+
+static unsigned int stack_maxrandom_size(void)
+{
+ unsigned int max = 0;
+ if ((current->flags & PF_RANDOMIZE) &&
+ !(current->personality & ADDR_NO_RANDOMIZE)) {
+ max = ((-1U) & STACK_RND_MASK) << PAGE_SHIFT;
+ }
+
+ return max;
+}
+
+
/*
* Top of mmap area (just below the process stack).
*
- * Leave an at least ~128 MB hole.
+ * Leave an at least ~128 MB hole with possible stack randomization.
*/
-#define MIN_GAP (128*1024*1024)
+#define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
#define MAX_GAP (TASK_SIZE/6*5)
/*
--
1.6.3.3
next reply other threads:[~2009-09-04 9:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-04 9:37 Michal Hocko [this message]
2009-09-07 8:28 ` Michal Hocko
2009-09-07 15:18 ` Jiri Kosina
2009-09-08 7:32 ` Michal Hocko
2009-09-08 8:43 ` [PATCH v3] " Michal Hocko
2009-09-08 8:47 ` Jiri Kosina
2009-09-08 8:53 ` Michal Hocko
2009-09-08 9:01 ` [PATCH v4] " Michal Hocko
2009-09-08 9:09 ` Jiri Kosina
2009-09-10 23:14 ` Jiri Kosina
2009-09-10 23:29 ` H. Peter Anvin
2009-09-11 0:06 ` [tip:x86/urgent] x86: Increase " tip-bot for Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1252057020-5207-1-git-send-email-mhocko@suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®