From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 17 Mar 2010 14:26:09 +0000 (-0700)
Subject: a .27 patch
X-Git-Tag: v2.6.27.46~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=762ebeb361811bb87fcfe917994d94c0d410a44b;p=thirdparty%2Fkernel%2Fstable-queue.git

a .27 patch
---

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index 510f7adda88..de19043bfc6 100644
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -31,3 +31,4 @@ tc-fix-unitialized-kernel-memory-leak.patch
 parisc-isa-eeprom-fix-loff_t-usage.patch
 kvm-x86-check-for-cr3-validity-in-ioctl_set_sregs.patch
 fix-lookup_follow-on-automount-symlinks.patch
+x86-ia32_aout-do-not-kill-argument-mapping.patch
diff --git a/queue-2.6.27/x86-ia32_aout-do-not-kill-argument-mapping.patch b/queue-2.6.27/x86-ia32_aout-do-not-kill-argument-mapping.patch
new file mode 100644
index 00000000000..12886b823c8
--- /dev/null
+++ b/queue-2.6.27/x86-ia32_aout-do-not-kill-argument-mapping.patch
@@ -0,0 +1,42 @@
+From 318f6b228ba88a394ef560efc1bfe028ad5ae6b6 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Wed, 10 Feb 2010 20:55:16 +0100
+Subject: x86, ia32_aout: do not kill argument mapping
+
+From: Jiri Slaby <jslaby@suse.cz>
+
+commit 318f6b228ba88a394ef560efc1bfe028ad5ae6b6 upstream.
+
+Do not set current->mm->mmap to NULL in 32-bit emulation on 64-bit
+load_aout_binary after flush_old_exec as it would destroy already
+set brpm mapping with arguments.
+
+Introduced by b6a2fea39318e43fee84fa7b0b90d68bed92d2ba
+mm: variable length argument support
+where the argument mapping in bprm was added.
+
+[ hpa: this is a regression from 2.6.22... time to kill a.out? ]
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+LKML-Reference: <1265831716-7668-1-git-send-email-jslaby@suse.cz>
+Cc: Ingo Molnar <mingo@elte.hu>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Ollie Wild <aaw@google.com>
+Cc: x86@kernel.org
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/x86/ia32/ia32_aout.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/x86/ia32/ia32_aout.c
++++ b/arch/x86/ia32/ia32_aout.c
+@@ -324,7 +324,6 @@ static int load_aout_binary(struct linux
+ 	current->mm->free_area_cache = TASK_UNMAPPED_BASE;
+ 	current->mm->cached_hole_size = 0;
+ 
+-	current->mm->mmap = NULL;
+ 	compute_creds(bprm);
+ 	current->flags &= ~PF_FORKNOEXEC;
+