mm/mremap: account unmoved locked pages in dontunmap_complete()
Subsystems (2)
PATCH 1/1 mm/mremap: account unmoved locked pages in dontunmap_complete()
When MREMAP_DONTUNMAP is performed on a VM_LOCKED VMA, dontunmap_complete() clears VMA_LOCKED_MASK on the entire source VMA (vrm->vma) before vrm_stat_account() runs. This assumes that the entire source VMA was moved into a distinct destination VMA (new_vma != vma) of equal size, transferring the VM_LOCKED accounting 1:1 from vma to new_vma.
However, two cases violate this assumption:
1. Partial MREMAP_DONTUNMAP on a multi-page VM_LOCKED VMA (vrm->old_len < vma->vm_end - vma->vm_start): vma_clear_flags_mask(vma, VMA_LOCKED_MASK) clears VM_LOCKED on the entire source VMA of size vma_pages(vma), while new_vma only inherits VM_LOCKED for vrm->old_len >> PAGE_SHIFT pages. The remaining unmoved pages in vma lose VM_LOCKED without decrementing mm->locked_vm.
2. Self-merge in copy_vma() (new_vma == vma, when new_addr is immediately adjacent to vma): copy_vma() expands vma by vrm->new_len, and dontunmap_complete() then clears VMA_LOCKED_MASK on the combined VMA. All originally locked pages lose VM_LOCKED without decrementing mm->locked_vm.
In both cases, subsequent munmap() of the VMAs sees VM_LOCKED cleared and does not decrement mm->locked_vm, permanently leaking mm->locked_vm until process exit and allowing unprivileged processes to exhaust RLIMIT_MEMLOCK.
Fix this in dontunmap_complete() by subtracting the number of pages that lose VM_LOCKED from current->mm->locked_vm before clearing VMA_LOCKED_MASK.
--- mm/mremap.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
mm/mremap.c +10 -0
@@ -1335,6 +1335,16 @@ static void dontunmap_complete(struct vma_remap_struct *vrm,unsigned long old_start = vma->vm_start;unsigned long old_end = vma->vm_end; +if (vma_test (vma,VMA_LOCKED_BIT )) { +unsigned long unl_pages =vma_pages (vma); + +if (new_vma != vma) + unl_pages -= vrm->old_len >>PAGE_SHIFT ; +else + unl_pages -= vrm->new_len >>PAGE_SHIFT ; + current->mm->locked_vm -= unl_pages; + } +/* We always clear VMA_LOCKED[ONFAULT]_BIT on the old VMA. */ vma_clear_flags_mask (vma,VMA_LOCKED_MASK );
Signature · 1 line
2.55.0.1082.g2b9226bbc0-goog
NAK.
You are engaging in abusive behaviour on the mailing list and it's totally unacceptable.
You sent 115 patches across 40 subsystems over a couple hours.
https://lore.kernel.org/all/?q=f%3Ahui+peng
DO NOT DO THIS.
You are in complete violation of kernel guidelines on generated content -
https://docs.kernel.org/process/generated-content.html
I will treat the report like an AI-generated report and figure out whether there's anything valid here independently.
--
Cheers, Lorenzo