Skip to contentSkip to conversation

mmap-add-clarifying-comment-to-vma_merge-code.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 18, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mmap: add clarifying comment to vma_merge() code
has been removed from the -mm tree. Its filename was
mmap-add-clarifying-comment-to-vma_merge-code.patch

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

------------------------------------------------------
From: "Liam R. Howlett" <[email protected]>
Subject: mmap: add clarifying comment to vma_merge() code
Date: Fri, 29 Sep 2023 14:30:41 -0400

When tracing through the code in vma_merge(), it was not completely clear why the error return to a dup_anon_vma() call would not overwrite a previous attempt to the same function. This commit adds a comment specifying why it is safe.

---

 mm/mmap.c |    5 +++++
 1 file changed, 5 insertions(+)
mm/mmap.c renamed from mm/mmap.c~mmap-add-clarifying-comment-to-vma_merge-code +5 -0
@@ -943,6 +943,11 @@ struct vm_area_struct *vma_merge(struct
 			vma_start_write(curr);
 			remove = curr;
 			remove2 = next;
+			/*
+			 * Note that the dup_anon_vma below cannot overwrite err
+			 * since the first caller would do nothing unless next
+			 * has an anon_vma.
+			 */
 			if (!next->anon_vma)
 				err = dup_anon_vma(prev, curr, &anon_dup);
 		}

_

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