mm-mremap-fix-mremap-expanding-vma-with-addr-inside-vma.patch removed from -mm tree
The quilt patch titled
Subject: mm, mremap: fix mremap() expanding vma with addr inside vma
has been removed from the -mm tree. Its filename was
mm-mremap-fix-mremap-expanding-vma-with-addr-inside-vma.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: Vlastimil Babka <[email protected]>
Subject: mm, mremap: fix mremap() expanding vma with addr inside vma
Date: Fri, 16 Dec 2022 17:32:27 +0100
Since 6.1 we have noticed random rpm install failures that were tracked to mremap() returning -ENOMEM and to commit ca3d76b0aa80 ("mm: add merging after mremap resize").
The problem occurs when mremap() expands a VMA in place, but using an starting address that's not vma->vm_start, but somewhere in the middle. The extension_pgoff calculation introduced by the commit is wrong in that case, so vma_merge() fails due to pgoffs not being compatible. Fix the calculation.
By the way it seems that the situations, where rpm now expands a vma from the middle, were made possible also due to that commit, thanks to the improved vma merging. Yet it should work just fine, except for the buggy calculation.
---
mm/mremap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/mremap.c renamed from mm/mremap.c~mm-mremap-fix-mremap-expanding-vma-with-addr-inside-vma +2 -1
@@ -1016,7 +1016,8 @@ SYSCALL_DEFINE5(mremap, unsigned long, along pages = (new_len - old_len) >>PAGE_SHIFT ;unsigned long extension_start = addr + old_len;unsigned long extension_end = addr + new_len; -pgoff_t extension_pgoff = vma->vm_pgoff + (old_len >>PAGE_SHIFT ); +pgoff_t extension_pgoff = vma->vm_pgoff + + ((extension_start - vma->vm_start) >>PAGE_SHIFT );if (vma->vm_flags &VM_ACCOUNT ) {if (security_vm_enough_memory_mm (mm, pages)) {
_
Patches currently in -mm which might be from [email protected] are