Skip to contentSkip to conversation

mm/mmap: Fix do_brk_munmap() when munmapping multiple mappings

PATCH New Liam Howlett 1 participant 1 message May 19, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/mmap: Fix do_brk_munmap() when munmapping multiple mappings

If the newbrk is less than the last brk vma start, then munmap entire VMA(s).

---
 mm/mmap.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/mmap.c +1 -2
index f1fc9c5c068b..c065a3d9b5da 100644
@@ -2942,8 +2942,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma,
 
 	arch_unmap(mm, newbrk, oldbrk);
 
-	if (likely((vma->vm_end < oldbrk) ||
-		   ((vma->vm_start == newbrk) && (vma->vm_end == oldbrk)))) {
+	if (likely((vma->vm_end < oldbrk) || (vma->vm_start >= newbrk))) {
 		/* remove entire mapping(s) */
 		ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf,
 					  true);
Signature · 1 line
2.35.1