rpms/kernel/F-11 fs-exec.c-fix-initial-stack-reservation.patch, NONE, 1.1 kernel.spec, 1.1822, 1.1823

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16791

Modified Files:
	kernel.spec 
Added Files:
	fs-exec.c-fix-initial-stack-reservation.patch 
Log Message:
Fix stack expansion rlimit check broken by a patch in 2.6.32.9

fs-exec.c-fix-initial-stack-reservation.patch:
 exec.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE fs-exec.c-fix-initial-stack-reservation.patch ---
From: Michael Neuling <mikey at neuling.org>
Date: Mon, 22 Feb 2010 20:44:24 +0000 (-0800)
Subject: fs/exec.c: fix initial stack reservation
X-Git-Tag: v2.6.33~10
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a17e18790a8c47113a73139d54a375dc9ccd8f08

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>
---

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;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1822
retrieving revision 1.1823
diff -u -p -r1.1822 -r1.1823
--- kernel.spec	25 Feb 2010 10:02:54 -0000	1.1822
+++ kernel.spec	27 Feb 2010 04:25:43 -0000	1.1823
@@ -752,6 +752,9 @@ Patch12311: fix-ima-null-ptr-deref.patch
 # rhbz#567530
 Patch12350: tcp-fix-icmp-rto-war.patch
 
+# fix breakage from 2.6.32.9
+Patch12400: fs-exec.c-fix-initial-stack-reservation.patch
+
 Patch20031: vgaarb-fix-userspace-ptr-deref.patch
 
 #===============================================================================
@@ -1383,6 +1386,9 @@ ApplyPatch fix-ima-null-ptr-deref.patch
 # rhbz#567530
 ApplyPatch tcp-fix-icmp-rto-war.patch
 
+# fix breakage from 2.6.32.9
+ApplyPatch fs-exec.c-fix-initial-stack-reservation.patch
+
 # END OF PATCH APPLICATIONS ====================================================
 
 %endif
@@ -2037,6 +2043,9 @@ fi
 # and build.
 
 %changelog
+* Fri Feb 26 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.9-38
+- Fix stack expansion rlimit check broken by a patch in 2.6.32.9
+
 * Thu Feb 25 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.9-37
 - TCP: fix broken RTO calculation causing high CPU load (#567530)