xtensa: fix lock_mm_and_find_vma in case VMA not found

jcmvbkbc · gregkh · commit 6b2849b3e05d · 2023-07-05T18:27:37.000+01:00
commit 03f8893 upstream. MMU version of lock_mm_and_find_vma releases the mm lock before returning when VMA is not found. Do the same in noMMU version. This fixes hang on an attempt to handle protection fault. Fixes: d85a143 ("xtensa: fix NOMMU build with lock_mm_and_find_vma() conversion") Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/mm/nommu.c b/mm/nommu.c
@@ -688,8 +688,13 @@ EXPORT_SYMBOL(find_vma);
 struct vm_area_struct *lock_mm_and_find_vma(struct mm_struct *mm,
 			unsigned long addr, struct pt_regs *regs)
 {
+	struct vm_area_struct *vma;
+
 	mmap_read_lock(mm);
-	return vma_lookup(mm, addr);
+	vma = vma_lookup(mm, addr);
+	if (!vma)
+		mmap_read_unlock(mm);
+	return vma;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -688,8 +688,13 @@ EXPORT_SYMBOL(find_vma);`
`688`	`688`	`struct vm_area_struct lock_mm_and_find_vma(struct mm_struct mm,`
`689`	`689`	`unsigned long addr, struct pt_regs *regs)`
`690`	`690`	`{`
	`691`	`+ struct vm_area_struct *vma;`
	`692`	`+`
`691`	`693`	`mmap_read_lock(mm);`
`692`		`- return vma_lookup(mm, addr);`
	`694`	`+ vma = vma_lookup(mm, addr);`
	`695`	`+ if (!vma)`
	`696`	`+ mmap_read_unlock(mm);`
	`697`	`+ return vma;`
`693`	`698`	`}`
`694`	`699`
`695`	`700`	`/*`