[PATCH] UBUNTU: SAUCE: fix get_gate_vma call in i386 NX emulation code

Herton Ronaldo Krzesinski herton.krzesinski at canonical.com
Tue Jun 5 20:29:33 UTC 2012


Since commit 31db58b3 ("mm: arch: make get_gate_vma take an mm_struct
instead of a task_struct"), that went in linux 2.6.39, get_gate_vma is
expected to take an struct mm_struct pointer as its parameter. But
get_gate_vma in i386 NX emulation code patch is still using the old way,
fix it.

BugLink: http://bugs.launchpad.net/bugs/1009200
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski at canonical.com>
---
 arch/x86/kernel/traps.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index f463b43..f7c210d 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -142,7 +142,7 @@ check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code)
 		for (vma = current->mm->mmap; vma; vma = vma->vm_next)
 			if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
 				limit = vma->vm_end;
-		vma = get_gate_vma(current);
+		vma = get_gate_vma(current->mm);
 		if (vma && (vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
 			limit = vma->vm_end;
 		spin_unlock(&current->mm->page_table_lock);
-- 
1.7.9.5





More information about the kernel-team mailing list