linux.kernel - 17 new messages in 15 topics - digest

linux.kernel
http://groups.google.com/group/linux.kernel?hl=en

linux.kernel@googlegroups.com

Today's topics:

* Restrict initial stack space expansion to rlimit - 2 messages, 2 authors
http://groups.google.com/group/linux.kernel/t/c1edecbd60f1c6b3?hl=en
* allow printk delay after multi lines - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/022bcc622a6a3de7?hl=en
* Performance regression in scsi sequential throughput (iozone) due to "e084b -
page-allocator: preserve PFN ordering when __GFP_COLD is set" - 1 messages, 1
author
http://groups.google.com/group/linux.kernel/t/0f198fe3053e9f98?hl=en
* cxgb3: fix GRO checksum check - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/1a6b52af78c23f6b?hl=en
* net: TCP thin linear timeouts - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/1c1d9af7a4062cf7?hl=en
* MAINTAINERS: networking drivers - Add git net-next tree - 1 messages, 1
author
http://groups.google.com/group/linux.kernel/t/6f15567fccf879ab?hl=en
* drivers/net: Correct NULL test - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/03f62149e888e4b4?hl=en
* net: irda: use seq_list_foo() helpers - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/e052e34bb3b656d5?hl=en
* ftrace: Allow to remove a single function from function graph filter - 1
messages, 1 author
http://groups.google.com/group/linux.kernel/t/0be259cd8b9145df?hl=en
* : Networking - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/16e215bff2b52e79?hl=en
* P4 PMU early draft - 2 messages, 1 author
http://groups.google.com/group/linux.kernel/t/cbcaa116bfdc609d?hl=en
* lockdep warning for iscsi in 2.6.33-rc6 - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/6acaccd7f9b9f9a4?hl=en
* Bluetooth: Keep a copy of each HID device's report descriptor. - 1 messages,
1 author
http://groups.google.com/group/linux.kernel/t/24254d069a593af0?hl=en
* socket(PF_INET6 hangs when ipv6 not yet initialized - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/7e909d88b03a6972?hl=en
* linux-next: Tree for February 9 - 1 messages, 1 author
http://groups.google.com/group/linux.kernel/t/591de13bea0bf71f?hl=en

==============================================================================
TOPIC: Restrict initial stack space expansion to rlimit
http://groups.google.com/group/linux.kernel/t/c1edecbd60f1c6b3?hl=en
==============================================================================

== 1 of 2 ==
Date: Mon, Feb 8 2010 10:20 pm
From: Michael Neuling

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 <mikey@neuling.org>
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;