From 4fcc13c1ff378fbf84f3b57c3d670cf48cb4250f Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Fri, 29 Sep 2023 16:08:21 -0700 Subject: [PATCH] ANDROID: mm: add missing check in the backport for handling faults under VMA lock While backporting, a check for vma locking inside do_wp_page() was missed. Add it. Fixes: 3ebafb7b468b ("BACKPORT: FROMGIT: mm: handle faults that merely update the accessed bit under the VMA lock") Bug: 293665307 Change-Id: Ibd7f21ae8fec7b8edc6e3d88954714b5fad41516 Signed-off-by: Suren Baghdasaryan --- mm/memory.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 0f780a8dfaef..78d5312c0078 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3500,6 +3500,12 @@ reuse: return wp_page_shared(vmf); } copy: + if ((vmf->flags & FAULT_FLAG_VMA_LOCK) && !vma->anon_vma) { + pte_unmap_unlock(vmf->pte, vmf->ptl); + vma_end_read(vmf->vma); + return VM_FAULT_RETRY; + } + /* * Ok, we need to copy. Oh, well.. */