From 9bdfe600b9caf37a74f8dcbcfa4ad0022940cdb2 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Sun, 30 Oct 2022 02:45:01 +0000 Subject: [PATCH] mm/mmap: move VMA locking before anon_vma_lock_write call Move VMA flag modification (which now implies VMA locking) before anon_vma_lock_write to match the locking order of page fault handler. Signed-off-by: Suren Baghdasaryan --- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index 2569f0bf58c3..389f6073595f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2957,13 +2957,13 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma, if (mas_preallocate(mas, vma, GFP_KERNEL)) return -ENOMEM; + set_vm_flags(vma, VM_SOFTDIRTY); vma_adjust_trans_huge(vma, vma->vm_start, addr + len, 0); if (vma->anon_vma) { anon_vma_lock_write(vma->anon_vma); anon_vma_interval_tree_pre_update_vma(vma); } vma->vm_end = addr + len; - set_vm_flags(vma, VM_SOFTDIRTY); mas_store_prealloc(mas, vma); if (vma->anon_vma) { -- 2.50.1