From: Michael Neuling <mikey@neuling.org>
To: Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, aeb@cwi.nl,
James Morris <jmorris@namei.org>,
miltonm@bga.com, Oleg Nesterov <oleg@redhat.com>,
linuxppc-dev@ozlabs.org, Paul Mackerras <paulus@samba.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
WANG Cong <xiyou.wangcong@gmail.com>,
linux-fsdevel@vger.kernel.org, Serge Hallyn <serue@us.ibm.com>,
Ingo Molnar <mingo@elte.hu>,
stable@kernel.org, Anton Blanchard <anton@samba.org>
Subject: [PATCH] Restrict stack space reservation to rlimit
Date: Mon, 08 Feb 2010 11:07:52 +1100 [thread overview]
Message-ID: <18033.1265587672@neuling.org> (raw)
In-Reply-To: <10125.1265451732@neuling.org>
apkm, linus: this or something like it needs to go into 2.6.33 (& 32) to
fix 'ulimit -s'.
Mikey
[PATCH] Restrict stack space reservation to rlimit
When reserving stack space for a new process, make sure we're not
attempting to allocate more than rlimit allows.
Also, reserve the same stack size independent of page size.
This fixes a bug unmasked by fc63cf237078c86214abcb2ee9926d8ad289da9b
Signed-off-by: Michael Neuling <mikey@neuling.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: stable@kernel.org
---
fs/exec.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Index: clone1/fs/exec.c
===================================================================
--- clone1.orig/fs/exec.c
+++ clone1/fs/exec.c
@@ -554,7 +554,7 @@ static int shift_arg_pages(struct vm_are
return 0;
}
-#define EXTRA_STACK_VM_PAGES 20 /* random */
+#define EXTRA_STACK_VM_SIZE 81920UL /* randomly 20 4K pages */
/*
* Finalizes the stack vm_area_struct. The flags and permissions are updated,
@@ -627,10 +627,13 @@ int setup_arg_pages(struct linux_binprm
goto out_unlock;
}
+ stack_base = min(EXTRA_STACK_VM_SIZE,
+ current->signal->rlim[RLIMIT_STACK].rlim_cur) -
+ PAGE_SIZE;
#ifdef CONFIG_STACK_GROWSUP
- stack_base = vma->vm_end + EXTRA_STACK_VM_PAGES * PAGE_SIZE;
+ stack_base = vma->vm_end + stack_base;
#else
- stack_base = vma->vm_start - EXTRA_STACK_VM_PAGES * PAGE_SIZE;
+ stack_base = vma->vm_start - stack_base;
#endif
ret = expand_stack(vma, stack_base);
if (ret)
next prev parent reply other threads:[~2010-02-08 0:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-06 0:43 Stack size protection broken on ppc64 Michael Neuling
2010-02-06 4:20 ` Anton Blanchard
2010-02-06 10:22 ` Michael Neuling
2010-02-08 0:04 ` Anton Blanchard
2010-02-08 0:07 ` Michael Neuling [this message]
2010-02-08 0:28 ` [PATCH] Restrict stack space reservation to rlimit Michael Neuling
2010-02-08 5:06 ` KOSAKI Motohiro
2010-02-08 5:11 ` Anton Blanchard
2010-02-08 5:22 ` KOSAKI Motohiro
2010-02-08 5:31 ` Anton Blanchard
2010-02-08 6:11 ` KOSAKI Motohiro
2010-02-08 5:37 ` Michael Neuling
2010-02-08 6:05 ` KOSAKI Motohiro
2010-02-08 7:07 ` Américo Wang
2010-02-08 7:11 ` KOSAKI Motohiro
2010-02-09 6:11 ` [PATCH] Restrict initial stack space expansion " Michael Neuling
2010-02-09 6:46 ` KOSAKI Motohiro
2010-02-09 8:59 ` Michael Neuling
2010-02-09 21:25 ` Andrew Morton
2010-02-09 21:51 ` Michael Neuling
2010-02-09 22:27 ` Helge Deller
2010-02-10 5:12 ` KOSAKI Motohiro
2010-02-10 5:30 ` Michael Neuling
2010-02-10 5:31 ` Michael Neuling
2010-02-11 22:16 ` Helge Deller
2010-02-11 22:22 ` Michael Neuling
2010-02-08 10:45 ` [PATCH] Restrict stack space reservation " Michael Neuling
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=18033.1265587672@neuling.org \
--to=mikey@neuling.org \
--cc=aeb@cwi.nl \
--cc=akpm@linux-foundation.org \
--cc=anton@samba.org \
--cc=jmorris@namei.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=miltonm@bga.com \
--cc=mingo@elte.hu \
--cc=oleg@redhat.com \
--cc=paulus@samba.org \
--cc=serue@us.ibm.com \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=xiyou.wangcong@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).