From: Mike Rapoport (Microsoft) <rppt@kernel.org>
Date: Fri, 14 Feb 2025 08:45:31 +0000 (+0200)
Subject: module: don't annotate ROX memory as kmemleak_not_leak()
X-Git-Tag: v6.15-rc1~216^2~118^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=675204778c69c2b3e0f6a4e2dbfeb4f3e89194ba;p=thirdparty%2Fkernel%2Flinux.git

module: don't annotate ROX memory as kmemleak_not_leak()

The ROX memory allocations are part of a larger vmalloc allocation and
annotating them with kmemleak_not_leak() confuses kmemleak.

Skip kmemleak_not_leak() annotations for the ROX areas.

Fixes: c287c0723329 ("module: switch to execmem API for remapping as RW and restoring ROX")
Fixes: 64f6a4e10c05 ("x86: re-enable EXECMEM_ROX support")
Reported-by: "Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com>
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20250214084531.3299390-1-rppt@kernel.org
---

diff --git a/kernel/module/main.c b/kernel/module/main.c
index 5c127bedd3f07..a256cc919ad74 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -1260,7 +1260,8 @@ static int module_memory_alloc(struct module *mod, enum mod_mem_type type)
 	 * *do* eventually get freed, but let's just keep things simple
 	 * and avoid *any* false positives.
 	 */
-	kmemleak_not_leak(ptr);
+	if (!mod->mem[type].is_rox)
+		kmemleak_not_leak(ptr);
 
 	memset(ptr, 0, size);
 	mod->mem[type].base = ptr;