From f62a1bce9b4938dc5dd022fa9a3d9ea2aa34b83c Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Fri, 4 Sep 2020 11:27:31 -0400 Subject: [PATCH] mm and fork: Fix mtree_destroy path Signed-off-by: Liam R. Howlett --- kernel/fork.c | 2 +- mm/mmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index 44a154f95746..2abc65388afa 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1079,6 +1079,7 @@ static inline void __mmput(struct mm_struct *mm) { VM_BUG_ON(atomic_read(&mm->mm_users)); + mt_clear_in_rcu(&mm->mm_mt); uprobe_clear_state(mm); exit_aio(mm); ksm_exit(mm); @@ -1093,7 +1094,6 @@ static inline void __mmput(struct mm_struct *mm) } if (mm->binfmt) module_put(mm->binfmt->module); - mt_clear_in_rcu(&mm->mm_mt); mmdrop(mm); } diff --git a/mm/mmap.c b/mm/mmap.c index c78317c8fdca..24537cc57c1f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3009,7 +3009,7 @@ void exit_mmap(struct mm_struct *mm) } trace_exit_mmap(mm); - mtree_direct_destroy(&mm->mm_mt); + mtree_destroy(&mm->mm_mt); vm_unacct_memory(nr_accounted); } -- 2.50.1