Skip to contentSkip to conversation

x86: ia32_aout, do not kill argument mapping

PATCH In review Jiri Slaby 1 participant 2 messages Feb 10, 2010 x86

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 1/1 x86: ia32_aout, do not kill argument mapping

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.

Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ollie Wild <[email protected]>
---
 arch/x86/ia32/ia32_aout.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/x86/ia32/ia32_aout.c +0 -1
index 9046e4a..280c019 100644
@@ -327,7 +327,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;
 	install_exec_creds(bprm);
 	current->flags &= ~PF_FORKNOEXEC;
 
Signature · 1 line
1.6.6.1
#1 lore raw

[tip:x86/urgent] x86, ia32_aout: do not kill argument mapping

Commit-ID:  318f6b228ba88a394ef560efc1bfe028ad5ae6b6
Gitweb:     http://git.kernel.org/tip/318f6b228ba88a394ef560efc1bfe028ad5ae6b6
Author:     Jiri Slaby <[email protected]>
AuthorDate: Wed, 10 Feb 2010 20:55:16 +0100
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Wed, 10 Feb 2010 12:03:34 -0800

x86, ia32_aout: do not kill argument mapping

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

LKML-Reference: <[email protected]>

---
 arch/x86/ia32/ia32_aout.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/x86/ia32/ia32_aout.c +0 -1
index f9f4724..14531ab 100644
@@ -327,7 +327,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;
 	install_exec_creds(bprm);
 	current->flags &= ~PF_FORKNOEXEC;