1 files changed, 7 insertions, 5 deletions

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index e83987c55a08..46c2290a08f1 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1657,8 +1657,7 @@ static void start_scan_thread(void)
 }
 
 /*
- * Stop the automatic memory scanning thread. This function must be called
- * with the scan_mutex held.
+ * Stop the automatic memory scanning thread.
  */
 static void stop_scan_thread(void)
 {
@@ -1921,12 +1920,15 @@ static void kmemleak_do_cleanup(struct work_struct *work)
 {
         stop_scan_thread();
 
+        mutex_lock(&scan_mutex);
         /*
-         * Once the scan thread has stopped, it is safe to no longer track
-         * object freeing. Ordering of the scan thread stopping and the memory
-         * accesses below is guaranteed by the kthread_stop() function.
+         * Once it is made sure that kmemleak_scan has stopped, it is safe to no
+         * longer track object freeing. Ordering of the scan thread stopping and
+         * the memory accesses below is guaranteed by the kthread_stop()
+         * function.
          */
         kmemleak_free_enabled = 0;
+        mutex_unlock(&scan_mutex);
 
         if (!kmemleak_found_leaks)
                 __kmemleak_do_cleanup();