kmemleak: Do not report new leaked objects if the scanning was stopped

If the scanning was stopped with a signal, it is possible that some
objects are left with a white colour (potential leaks) and reported. Add
a check to avoid reporting such objects.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index c37e8e50e4dee4acbd703be744c45173796b3633..e094c4dbdf55bf3ffe44eb43bb0772903d8d2103 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1029,6 +1029,12 @@ static void kmemleak_scan(void)
        }
        WARN_ON(!list_empty(&gray_list));
 
+       /*
+        * If scanning was stopped do not report any new unreferenced objects.
+        */
+       if (scan_should_stop())
+               return;
+
        /*
         * Scanning result reporting.
         */
@@ -1184,11 +1190,10 @@ static int kmemleak_seq_show(struct seq_file *seq, void *v)
        unsigned long flags;
 
        spin_lock_irqsave(&object->lock, flags);
-       if (!unreferenced_object(object))
-               goto out;
-       print_unreferenced(seq, object);
-       reported_leaks++;
-out:
+       if ((object->flags & OBJECT_REPORTED) && unreferenced_object(object)) {
+               print_unreferenced(seq, object);
+               reported_leaks++;
+       }
        spin_unlock_irqrestore(&object->lock, flags);
        return 0;
 }