On Mon, Jul 10, 2023 at 05:46:32PM -0700, Suren Baghdasaryan wrote:
> 6.1 backport of the patch [1] uses 'next' vma instead of 'split' vma.
> Fix the mistake.
>
> [1] commit 606c812eb1d5 ("mm/mmap: Fix error path in do_vmi_align_munmap()")
>
> Fixes: a149174ff8bb ("mm/mmap: Fix error path in do_vmi_align_munmap()")
> Signed-off-by: Suren Baghdasaryan <surenb@xxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> ---
> mm/mmap.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/mmap.c b/mm/mmap.c
> index b8af52db3bbe..1597a96b667f 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -2484,7 +2484,7 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma,
> error = mas_store_gfp(&mas_detach, split, GFP_KERNEL);
> if (error)
> goto munmap_gather_failed;
> - if (next->vm_flags & VM_LOCKED)
> + if (split->vm_flags & VM_LOCKED)
> locked_vm += vma_pages(split);
>
> count++;
> --
> 2.41.0.390.g38632f3daf-goog
>
Thanks, now queued up.
greg k-h
