mm-mmap-vma_merge-explicitly-assign-res-vma-extend-invariants.patch removed from -mm tree
The quilt patch titled
Subject: mm/mmap/vma_merge: explicitly assign res, vma, extend invariants
has been removed from the -mm tree. Its filename was
mm-mmap-vma_merge-explicitly-assign-res-vma-extend-invariants.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: Lorenzo Stoakes <[email protected]>
Subject: mm/mmap/vma_merge: explicitly assign res, vma, extend invariants
Date: Wed, 22 Mar 2023 20:18:59 +0000
Previously, vma was an uninitialised variable which was only definitely assigned as a result of the logic covering all possible input cases - for it to have remained uninitialised, prev would have to be NULL, and next would _have_ to be mergeable.
The value of res defaults to NULL, so we can neatly eliminate the assignment to res and vma in the if (prev) block and ensure that both res and vma are both explicitly assigned, by just setting both to prev.
In addition we add an explanation as to under what circumstances both might change, and since we absolutely do rely on addr == curr->vm_start should curr exist, assert that this is the case.
---
mm/mmap.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
mm/mmap.c renamed from mm/mmap.c~mm-mmap-vma_merge-explicitly-assign-res-vma-extend-invariants +14 -5
@@ -898,7 +898,7 @@ struct vm_area_struct *vma_merge(struct {pgoff_t pglen = (end - addr) >>PAGE_SHIFT ;pgoff_t vma_pgoff; -struct vm_area_struct *curr, *next, *res =NULL ; +struct vm_area_struct *curr, *next, *res;struct vm_area_struct *vma, *adjust, *remove, *remove2;int err =-1 ;bool merge_prev = false;
@@ -926,14 +926,18 @@ struct vm_area_struct *vma_merge(structelse next =NULL ;/* case 5 */ -/* verify some invariant that must be enforced by the caller */ +/* +* By default, we return prev. Cases 3, 4, 8 will instead return next +* and cases 3, 8 will also update vma to point at next. +*/ + res = vma = prev; + +/* Verify some invariant that must be enforced by the caller. */ VM_WARN_ON (prev && addr <= prev->vm_start); -VM_WARN_ON (curr && end > curr->vm_end); +VM_WARN_ON (curr && (addr != curr->vm_start || end > curr->vm_end));VM_WARN_ON (addr >= end);if (prev) { - res = prev; - vma = prev; vma_start = prev->vm_start; vma_pgoff = prev->vm_pgoff;/* Can we merge the predecessor? */
@@ -944,6 +948,7 @@ struct vm_area_struct *vma_merge(structvma_prev (vmi); } } +/* Can we merge the successor? */ if (next &&mpol_equal (policy,vma_policy (next)) && can_vma_merge_before(next, vm_flags,
@@ -984,6 +989,10 @@ struct vm_area_struct *vma_merge(struct adj_start = -(prev->vm_end - addr); err =dup_anon_vma (next, prev); }else { +/* +* Note that cases 3 and 8 are the ONLY ones where prev +* is permitted to be (but is not necessarily) NULL. +*/ vma = next;/* case 3 */ vma_start = addr; vma_end = next->vm_end;
_
Patches currently in -mm which might be from [email protected] are