Received-SPF: pass (google.com: domain of linux-kernel+bounces-14564-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Chris von Recklinghausen <crecklin@redhat.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	linux-kernel@vger.kernel.org
Cc: crecklin@redhat.com
Subject: [PATCH] don't record leak information on allocations done between kmemleak_init and kmemleak_late_init
Date: Tue,  2 Jan 2024 10:34:28 -0500
Message-ID: <20240102153428.139984-1-crecklin@redhat.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

If an object is allocated after kmemleak_init is called but before
kmemleak_late_init is called, calls to kmemleak_not_leak or
kmemleak_ignore on the object don't prevent a scan from reporting the
object as a leak.

Avoid this situation by only registering objects in kmemleak_alloc when
kmemleak_initialized is set.

Signed-off-by: Chris von Recklinghausen <crecklin@redhat.com>
---
 mm/kmemleak.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 5501363d6b31..0c8a5f456874 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1117,7 +1117,8 @@ void __ref kmemleak_free_part(const void *ptr, size_t size)
 {
 	pr_debug("%s(0x%px)\n", __func__, ptr);
 
-	if (kmemleak_enabled && ptr && !IS_ERR(ptr))
+	if (kmemleak_enabled && kmemleak_late_initialized && ptr &&
+		!IS_ERR(ptr))
 		delete_object_part((unsigned long)ptr, size, false);
 }
 EXPORT_SYMBOL_GPL(kmemleak_free_part);
@@ -1135,7 +1136,8 @@ void __ref kmemleak_free_percpu(const void __percpu *ptr)
 
 	pr_debug("%s(0x%px)\n", __func__, ptr);
 
-	if (kmemleak_free_enabled && ptr && !IS_ERR(ptr))
+	if (kmemleak_free_enabled && kmemleak_late_initialized && ptr &&
+		!IS_ERR(ptr))
 		for_each_possible_cpu(cpu)
 			delete_object_full((unsigned long)per_cpu_ptr(ptr,
 								      cpu));
@@ -1189,7 +1191,8 @@ void __ref kmemleak_not_leak(const void *ptr)
 {
 	pr_debug("%s(0x%px)\n", __func__, ptr);
 
-	if (kmemleak_enabled && ptr && !IS_ERR(ptr))
+	if (kmemleak_enabled && kmamleak_late_initialized && ptr &&
+		!IS_ERR(ptr))
 		make_gray_object((unsigned long)ptr);
 }
 EXPORT_SYMBOL(kmemleak_not_leak);
@@ -1207,7 +1210,8 @@ void __ref kmemleak_ignore(const void *ptr)
 {
 	pr_debug("%s(0x%px)\n", __func__, ptr);
 
-	if (kmemleak_enabled && ptr && !IS_ERR(ptr))
+	if (kmemleak_enabled && kmamleak_late_initialized && ptr &&
+		!IS_ERR(ptr))
 		make_black_object((unsigned long)ptr, false);
 }
 EXPORT_SYMBOL(kmemleak_ignore);
-- 
2.43.0