From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Fri, 13 May 2022 14:13:22 +0000 (-0400)
Subject: mm/mmap: Fix potential leak on do_mas_align_munmap()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8798c6f9e02b084763b7948224bbca06f16a30fe;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Fix potential leak on do_mas_align_munmap()

There is a leak when the system is low on resources and fails to
allocate enough memory to complete the munmap task.  Fix this by adding
the necessary free operations in the unwinding.

Fixes: a760774e7b7b (mm: start tracking VMAs with maple tree)
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index 546034e7e1f7..de264351ce88 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2454,7 +2454,7 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma,
 		return -ENOMEM;
 
 	if (mas_preallocate(&mas_detach, vma, GFP_KERNEL))
-		return -ENOMEM;
+		goto detach_alloc_fail;
 
 	mas->last = end - 1;
 	/* If we need to split any vma, do it now to save pain later. */
@@ -2577,6 +2577,8 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma,
 map_count_exceeded:
 split_failed:
 userfaultfd_error:
+	mas_destroy(&mas_detach);
+detach_alloc_fail:
 	mas_destroy(mas);
 	return error;
 }