From: Suren Baghdasaryan <surenb@google.com>
To: gregkh@linuxfoundation.org
Cc: Liam.Howlett@oracle.com, torvalds@linux-foundation.org,
vegard.nossum@oracle.com, stable@vger.kernel.org,
Suren Baghdasaryan <surenb@google.com>
Subject: [PATCH 6.1 1/1] mm/mmap: Fix VM_LOCKED check in do_vmi_align_munmap()
Date: Mon, 10 Jul 2023 17:46:32 -0700 [thread overview]
Message-ID: <20230711004632.579668-1-surenb@google.com> (raw)
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
---
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
next reply other threads:[~2023-07-11 0:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 0:46 Suren Baghdasaryan [this message]
2023-07-11 20:22 ` [PATCH 6.1 1/1] mm/mmap: Fix VM_LOCKED check in do_vmi_align_munmap() Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230711004632.579668-1-surenb@google.com \
--to=surenb@google.com \
--cc=Liam.Howlett@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=vegard.nossum@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox