diff options
| author | Mike Rapoport (Microsoft) <rppt@kernel.org> | 2025-02-14 10:45:31 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2025-02-14 10:32:02 +0100 |
| commit | 675204778c69c2b3e0f6a4e2dbfeb4f3e89194ba (patch) | |
| tree | ef5039d848ba6ed8f48b583b33abe8c55643c928 | |
| parent | 63887c9f02030afd042c125052ad60680f7c21b2 (diff) | |
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
| -rw-r--r-- | kernel/module/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/module/main.c b/kernel/module/main.c index 5c127bedd3f0..a256cc919ad7 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; |