GIT: unionfs2-2.6.27.y: x86, ia32_aout: do not kill argument mapping

[Erez Zadok]

commit 4e6d03059d809ab08dd75c19203ccbdd94a58273
Author: Jiri Slaby <jslaby at suse.cz>
Date:   Wed Feb 10 20:55:16 2010 +0100

    x86, ia32_aout: do not kill argument mapping
    
    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 at suse.cz>
    LKML-Reference: <1265831716-7668-1-git-send-email-jslaby at suse.cz>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Ollie Wild <aaw at google.com>
    Cc: x86 at kernel.org
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index a0e1dbe..5efd5b2 100644
--- 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_binprm *bprm, struct pt_regs *regs)
 	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;