Skip to contentSkip to conversation

nommu-fix-do_munmap-error-path.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Jan 12, 2023 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: nommu: fix do_munmap() error path
has been removed from the -mm tree. Its filename was
nommu-fix-do_munmap-error-path.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Liam Howlett <[email protected]>
Subject: nommu: fix do_munmap() error path
Date: Mon, 9 Jan 2023 20:57:21 +0000

When removing a VMA from the tree fails due to no memory, do not free the VMA since a reference still exists.

Fixes 8220543df148 ("nommu: remove uses of VMA linked list")
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Yu Zhao <[email protected]>

---

 mm/nommu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
mm/nommu.c renamed from mm/nommu.c~nommu-fix-do_munmap-error-path +2 -1
@@ -1509,7 +1509,8 @@ int do_munmap(struct mm_struct *mm, unsi
 erase_whole_vma:
 	if (delete_vma_from_mm(vma))
 		ret = -ENOMEM;
-	delete_vma(mm, vma);
+	else
+		delete_vma(mm, vma);
 	return ret;
 }
 

_

Patches currently in -mm which might be from [email protected] are

maple_tree-fix-mas_empty_area_rev-lower-bound-validation.patch maple_tree-remove-gfp_zero-from-kmem_cache_alloc-and-kmem_cache_alloc_bulk.patch