mm/mmap: Fix VM_LOCKED check in do_vmi_align_munmap()
authorSuren Baghdasaryan <surenb@google.com>
Tue, 11 Jul 2023 00:46:32 +0000 (17:46 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Jul 2023 14:21:46 +0000 (16:21 +0200)
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@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mm/mmap.c

index b8af52d..1597a96 100644 (file)
--- 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++;