From patchwork Tue Feb 9 06:46:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: KOSAKI Motohiro X-Patchwork-Id: 44881 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 65499B7F5D for ; Tue, 9 Feb 2010 17:47:06 +1100 (EST) Received: by ozlabs.org (Postfix) id DB43AB7D0D; Tue, 9 Feb 2010 17:46:56 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from fgwmail7.fujitsu.co.jp (fgwmail7.fujitsu.co.jp [192.51.44.37]) by ozlabs.org (Postfix) with ESMTP id 32980B7CA6 for ; Tue, 9 Feb 2010 17:46:54 +1100 (EST) Received: from m2.gw.fujitsu.co.jp ([10.0.50.72]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o196krRn018004 for (envelope-from kosaki.motohiro@jp.fujitsu.com); Tue, 9 Feb 2010 15:46:53 +0900 Received: from smail (m2 [127.0.0.1]) by outgoing.m2.gw.fujitsu.co.jp (Postfix) with ESMTP id C562145DE65 for ; Tue, 9 Feb 2010 15:46:52 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92]) by m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 9C34745DE5D for ; Tue, 9 Feb 2010 15:46:52 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id 6C1EF1DF8002 for ; Tue, 9 Feb 2010 15:46:52 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.249.87.103]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id ED065E78001 for ; Tue, 9 Feb 2010 15:46:51 +0900 (JST) Received: from ml13.css.fujitsu.com (ml13 [127.0.0.1]) by ml13.s.css.fujitsu.com (Postfix) with ESMTP id B2B3CFD000E; Tue, 9 Feb 2010 15:46:51 +0900 (JST) Received: from [127.0.0.1] (KOSANOTE2.numD3.wlan.css.fujitsu.com [10.124.134.104]) by ml13.s.css.fujitsu.com (Postfix) with ESMTP id C4DB7FD0001; Tue, 9 Feb 2010 15:46:50 +0900 (JST) X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Received: from KOSANOTE2[10.124.134.104] by KOSANOTE2 (FujitsuOutboundMailChecker v1.3.1/9992[10.124.134.104]); Tue, 09 Feb 2010 15:46:50 +0900 (JST) From: KOSAKI Motohiro To: Michael Neuling Subject: Re: [PATCH] Restrict initial stack space expansion to rlimit In-Reply-To: <1273.1265695885@neuling.org> References: <20100208161014.7C6D.A69D9226@jp.fujitsu.com> <1273.1265695885@neuling.org> Message-Id: <20100209154141.03F0.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 X-Mailer: Becky! ver. 2.50.07 [ja] Date: Tue, 9 Feb 2010 15:46:50 +0900 (JST) Cc: stable@kernel.org, aeb@cwi.nl, Oleg Nesterov , miltonm@bga.com, James Morris , linuxppc-dev@ozlabs.org, Paul Mackerras , Anton Blanchard , kosaki.motohiro@jp.fujitsu.com, Serge Hallyn , linux-fsdevel@vger.kernel.org, Americo Wang , Andrew Morton , Linus Torvalds , Ingo Molnar , linux-kernel@vger.kernel.org, Alexander Viro X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org > When reserving stack space for a new process, make sure we're not > attempting to expand the stack by more than rlimit allows. > > This fixes a bug caused by b6a2fea39318e43fee84fa7b0b90d68bed92d2ba "mm: > variable length argument support" and unmasked by > fc63cf237078c86214abcb2ee9926d8ad289da9b "exec: setup_arg_pages() fails > to return errors". This bug means when limiting the stack to less the > 20*PAGE_SIZE (eg. 80K on 4K pages or 'ulimit -s 79') all processes will > be killed before they start. This is particularly bad with 64K pages, > where a ulimit below 1280K will kill every process. > > Signed-off-by: Michael Neuling > Cc: stable@kernel.org > --- > Attempts to answer comments from Kosaki Motohiro. > > Tested on PPC only, hence !CONFIG_STACK_GROWSUP. Someone should > probably ACK for an arch with CONFIG_STACK_GROWSUP. > > As noted, stable needs the same patch, but 2.6.32 doesn't have the > rlimit() helper. > > fs/exec.c | 21 ++++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) > > Index: linux-2.6-ozlabs/fs/exec.c > =================================================================== > --- linux-2.6-ozlabs.orig/fs/exec.c > +++ linux-2.6-ozlabs/fs/exec.c > @@ -555,6 +555,7 @@ static int shift_arg_pages(struct vm_are > } > > #define EXTRA_STACK_VM_PAGES 20 /* random */ > +#define ALIGN_DOWN(addr,size) ((addr)&(~((size)-1))) > > /* > * Finalizes the stack vm_area_struct. The flags and permissions are updated, > @@ -570,7 +571,7 @@ int setup_arg_pages(struct linux_binprm > struct vm_area_struct *vma = bprm->vma; > struct vm_area_struct *prev = NULL; > unsigned long vm_flags; > - unsigned long stack_base; > + unsigned long stack_base, stack_expand, stack_expand_lim, stack_size; > > #ifdef CONFIG_STACK_GROWSUP > /* Limit stack size to 1GB */ > @@ -627,10 +628,24 @@ int setup_arg_pages(struct linux_binprm > goto out_unlock; > } > > + stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE; > + stack_size = vma->vm_end - vma->vm_start; > + if (rlimit(RLIMIT_STACK) < stack_size) > + stack_expand_lim = 0; /* don't shrick the stack */ > + else > + /* > + * Align this down to a page boundary as expand_stack > + * will align it up. > + */ > + stack_expand_lim = ALIGN_DOWN(rlimit(RLIMIT_STACK) - stack_size, > + PAGE_SIZE); > + /* Initial stack must not cause stack overflow. */ > + if (stack_expand > stack_expand_lim) > + stack_expand = stack_expand_lim; > #ifdef CONFIG_STACK_GROWSUP > - stack_base = vma->vm_end + EXTRA_STACK_VM_PAGES * PAGE_SIZE; > + stack_base = vma->vm_end + stack_expand; > #else > - stack_base = vma->vm_start - EXTRA_STACK_VM_PAGES * PAGE_SIZE; > + stack_base = vma->vm_start - stack_expand; > #endif > ret = expand_stack(vma, stack_base); > if (ret) Umm.. It looks correct. but the nested complex if statement seems a bit ugly. Instead, How about following? note: it's untested. =============== From: Michael Neuling Subject: Restrict initial stack space expansion to rlimit When reserving stack space for a new process, make sure we're not attempting to expand the stack by more than rlimit allows. This fixes a bug caused by b6a2fea39318e43fee84fa7b0b90d68bed92d2ba "mm: variable length argument support" and unmasked by fc63cf237078c86214abcb2ee9926d8ad289da9b "exec: setup_arg_pages() fails to return errors". This bug means when limiting the stack to less the 20*PAGE_SIZE (eg. 80K on 4K pages or 'ulimit -s 79') all processes will be killed before they start. This is particularly bad with 64K pages, where a ulimit below 1280K will kill every process. [kosaki.motohiro@jp.fujitsu.com: cleanups] Signed-off-by: Michael Neuling Signed-off-by: KOSAKI Motohiro Cc: stable@kernel.org --- Attempts to answer comments from Kosaki Motohiro. Tested on PPC only, hence !CONFIG_STACK_GROWSUP. Someone should probably ACK for an arch with CONFIG_STACK_GROWSUP. As noted, stable needs the same patch, but 2.6.32 doesn't have the rlimit() helper. diff --git a/fs/exec.c b/fs/exec.c index 6f7fb0c..325bad4 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -573,6 +573,9 @@ int setup_arg_pages(struct linux_binprm *bprm, struct vm_area_struct *prev = NULL; unsigned long vm_flags; unsigned long stack_base; + unsigned long stack_size; + unsigned long stack_expand; + unsigned long rlim_stack; #ifdef CONFIG_STACK_GROWSUP /* Limit stack size to 1GB */ @@ -629,10 +632,27 @@ int setup_arg_pages(struct linux_binprm *bprm, goto out_unlock; } + stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE; + stack_size = vma->vm_end - vma->vm_start; + /* + * Align this down to a page boundary as expand_stack + * will align it up. + */ + rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK; + if (rlim_stack < stack_size) + rlim_stack = stack_size; #ifdef CONFIG_STACK_GROWSUP - stack_base = vma->vm_end + EXTRA_STACK_VM_PAGES * PAGE_SIZE; + if (stack_size + stack_expand > rlim_stack) { + stack_base = vma->vm_start + rlim_stack; + } else { + stack_base = vma->vm_end + stack_expand; + } #else - stack_base = vma->vm_start - EXTRA_STACK_VM_PAGES * PAGE_SIZE; + if (stack_size + stack_expand > rlim_stack) { + stack_base = vma->vm_end - rlim_stack; + } else { + stack_base = vma->vm_start - stack_expand; + } #endif ret = expand_stack(vma, stack_base); if (ret)