packages (LINUX_2_6_32): kernel/kernel-small_fixes.patch, kernel/kernel.spe...

arekm arekm at pld-linux.org
Thu Mar 4 13:36:24 CET 2010


Author: arekm                        Date: Thu Mar  4 12:36:24 2010 GMT
Module: packages                      Tag: LINUX_2_6_32
---- Log message:
- rel 2; important bugfix

---- Files affected:
packages/kernel:
   kernel-small_fixes.patch (1.8 -> 1.8.2.1) , kernel.spec (1.755 -> 1.755.2.1) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.8 packages/kernel/kernel-small_fixes.patch:1.8.2.1
--- packages/kernel/kernel-small_fixes.patch:1.8	Sat Dec  5 00:27:40 2009
+++ packages/kernel/kernel-small_fixes.patch	Thu Mar  4 13:36:17 2010
@@ -65,3 +65,50 @@
  	default y
  
  source "drivers/infiniband/hw/mthca/Kconfig"
+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.7.0.1
+

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.755 packages/kernel/kernel.spec:1.755.2.1
--- packages/kernel/kernel.spec:1.755	Tue Feb 23 20:11:25 2010
+++ packages/kernel/kernel.spec	Thu Mar  4 13:36:17 2010
@@ -116,7 +116,7 @@
 
 %define		basever		2.6.32
 %define		postver		.9
-%define		rel		1
+%define		rel		2
 
 %define		_enable_debug_packages			0
 
@@ -1599,6 +1599,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.755.2.1  2010/03/04 12:36:17  arekm
+- rel 2; important bugfix
+
 Revision 1.755  2010/02/23 19:11:25  arekm
 - up to 2.6.32.9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.8&r2=1.8.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.755&r2=1.755.2.1&f=u



More information about the pld-cvs-commit mailing list