Skip to content

Commit 6db504c

Browse files
howlettakpm00
authored andcommitted
mm/ksm: fix race with VMA iteration and mm_struct teardown
exit_mmap() will tear down the VMAs and maple tree with the mmap_lock held in write mode. Ensure that the maple tree is still valid by checking ksm_test_exit() after taking the mmap_lock in read mode, but before the for_each_vma() iterator dereferences a destroyed maple tree. Since the maple tree is destroyed, the flags telling lockdep to check an external lock has been cleared. Skip the for_each_vma() iterator to avoid dereferencing a maple tree without the external lock flag, which would create a lockdep warning. Link: https://lkml.kernel.org/r/20230308220310.3119196-1-Liam.Howlett@oracle.com Fixes: a5f18ba ("mm/ksm: use vma iterators instead of vma linked list") Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com> Reported-by: Pengfei Xu <pengfei.xu@intel.com> Link: https://lore.kernel.org/lkml/ZAdUUhSbaa6fHS36@xpf.sh.intel.com/ Reported-by: syzbot+2ee18845e89ae76342c5@syzkaller.appspotmail.com Link: https://syzkaller.appspot.com/bug?id=64a3e95957cd3deab99df7cd7b5a9475af92c93e Acked-by: David Hildenbrand <david@redhat.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: <heng.su@intel.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent d035230 commit 6db504c

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

mm/ksm.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,9 +988,15 @@ static int unmerge_and_remove_all_rmap_items(void)
988988

989989
mm = mm_slot->slot.mm;
990990
mmap_read_lock(mm);
991+
992+
/*
993+
* Exit right away if mm is exiting to avoid lockdep issue in
994+
* the maple tree
995+
*/
996+
if (ksm_test_exit(mm))
997+
goto mm_exiting;
998+
991999
for_each_vma(vmi, vma) {
992-
if (ksm_test_exit(mm))
993-
break;
9941000
if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
9951001
continue;
9961002
err = unmerge_ksm_pages(vma,
@@ -999,6 +1005,7 @@ static int unmerge_and_remove_all_rmap_items(void)
9991005
goto error;
10001006
}
10011007

1008+
mm_exiting:
10021009
remove_trailing_rmap_items(&mm_slot->rmap_list);
10031010
mmap_read_unlock(mm);
10041011

0 commit comments

Comments
 (0)