This is a note to let you know that I've just added the patch titled
mm/mmap: Fix VM_LOCKED check in do_vmi_align_munmap()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mm-mmap-fix-vm_locked-check-in-do_vmi_align_munmap.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From surenb@xxxxxxxxxx Tue Jul 11 22:12:29 2023
From: Suren Baghdasaryan <surenb@xxxxxxxxxx>
Date: Mon, 10 Jul 2023 17:46:32 -0700
Subject: mm/mmap: Fix VM_LOCKED check in do_vmi_align_munmap()
To: gregkh@xxxxxxxxxxxxxxxxxxx
Cc: Liam.Howlett@xxxxxxxxxx, torvalds@xxxxxxxxxxxxxxxxxxxx, vegard.nossum@xxxxxxxxxx, stable@xxxxxxxxxxxxxxx, Suren Baghdasaryan <surenb@xxxxxxxxxx>
Message-ID: <20230711004632.579668-1-surenb@xxxxxxxxxx>
From: Suren Baghdasaryan <surenb@xxxxxxxxxx>
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
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
mm/mmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2484,7 +2484,7 @@ do_mas_align_munmap(struct ma_state *mas
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++;
Patches currently in stable-queue which might be from surenb@xxxxxxxxxx are
queue-6.1/mm-mmap-fix-vm_locked-check-in-do_vmi_align_munmap.patch
