---

yaml --- r: 347771 b: refs/heads/master c: 7bf9b7b h: refs/heads/master i: 347769: 39af191 347767: 3d7813f v: v3
git-mirror · Dec 20, 2012 · 0c5bfa0 · 0c5bfa0
1 parent 0808193
commit 0c5bfa0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dad5451a322bb682704f3ab13a558508a83e0b93
+refs/heads/master: 7bf9b7bef881aac820bf1f2e9951a17b09bd7e04
diff --git a/trunk/arch/arm/kernel/swp_emulate.c b/trunk/arch/arm/kernel/swp_emulate.c
@@ -109,10 +109,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr)
 {
 	siginfo_t info;
 
+	down_read(&current->mm->mmap_sem);
 	if (find_vma(current->mm, addr) == NULL)
 		info.si_code = SEGV_MAPERR;
 	else
 		info.si_code = SEGV_ACCERR;
+	up_read(&current->mm->mmap_sem);
 
 	info.si_signo = SIGSEGV;
 	info.si_errno = 0;