[kernel] r15266 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Wed Feb 24 01:07:52 2010
New Revision: 15266

Log:
fs/exec.c: fix initial stack reservation (regression in 2.6.32.9)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/fs-exec.c-fix-initial-stack-reservation.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Feb 24 01:07:29 2010	(r15265)
+++ dists/sid/linux-2.6/debian/changelog	Wed Feb 24 01:07:52 2010	(r15266)
@@ -10,6 +10,7 @@
     (Closes: #508108)
   * sfc: Apply fixes from 2.6.33
   * ath9k: Add support for AR2427
+  * fs/exec.c: fix initial stack reservation (regression in 2.6.32.9)
 
   [ maximilian attems]
   * Postinst don't refercence k-p related manpage. (closes: #542208)

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/fs-exec.c-fix-initial-stack-reservation.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/fs-exec.c-fix-initial-stack-reservation.patch	Wed Feb 24 01:07:52 2010	(r15266)
@@ -0,0 +1,47 @@
+From a17e18790a8c47113a73139d54a375dc9ccd8f08 Mon Sep 17 00:00:00 2001
+From: Michael Neuling <mikey at neuling.org>
+Date: Mon, 22 Feb 2010 12:44:24 -0800
+Subject: [PATCH] fs/exec.c: fix initial stack reservation
+
+803bf5ec259941936262d10ecc84511b76a20921 ("fs/exec.c: restrict initial
+stack space expansion to rlimit") attempts to limit the initial stack to
+20*PAGE_SIZE.  Unfortunately, in attempting ensure the stack is not
+reduced in size, we ended up not changing the stack at all.
+
+This size reduction check is not necessary as the expand_stack call does
+this already.
+
+This caused a regression in UML resulting in most guest processes being
+killed.
+
+Signed-off-by: Michael Neuling <mikey at neuling.org>
+Reviewed-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
+Acked-by: WANG Cong <xiyou.wangcong at gmail.com>
+Cc: Anton Blanchard <anton at samba.org>
+Cc: Oleg Nesterov <oleg at redhat.com>
+Cc: James Morris <jmorris at namei.org>
+Cc: Serge Hallyn <serue at us.ibm.com>
+Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Cc: Jouni Malinen <j at w1.fi>
+Cc: <stable at kernel.org>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ fs/exec.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/fs/exec.c b/fs/exec.c
+index e95c692..cce6bbd 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -637,7 +637,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+ 	 * will align it up.
+ 	 */
+ 	rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK;
+-	rlim_stack = min(rlim_stack, stack_size);
+ #ifdef CONFIG_STACK_GROWSUP
+ 	if (stack_size + stack_expand > rlim_stack)
+ 		stack_base = vma->vm_start + rlim_stack;
+-- 
+1.6.6.2
+

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	Wed Feb 24 01:07:29 2010	(r15265)
+++ dists/sid/linux-2.6/debian/patches/series/9	Wed Feb 24 01:07:52 2010	(r15266)
@@ -22,3 +22,4 @@
 + features/arm/openrd-base-uart.patch
 + features/arm/dns323-rev-a1-powerled.patch
 + bugfix/all/vgaarb-fix-target-default-passing.patch
++ bugfix/all/fs-exec.c-fix-initial-stack-reservation.patch