From 6c3417436a6f3ac0813095d90d970bd243659df1 Mon Sep 17 00:00:00 2001 From: Jone Chou Date: Fri, 10 Sep 2021 21:13:08 +0800 Subject: [PATCH] ANDROID: kernel: fix module info for debug_kinfo After commit f80fb3a3d508 ("arm64: add support for kernel ASLR") The module range is determined by module_alloc_base and MODULES_VSIZE; Fixes: c6857771051a ("ANDROID: kernel: add module info for debug_kinfo") Bug: 191677481 Bug: 191767613 Bug: 199478594 Signed-off-by: Jone Chou Change-Id: Id41d95cfba01e8e5502d058f98e30ecbaf52abe4 --- drivers/staging/android/debug_kinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/debug_kinfo.c b/drivers/staging/android/debug_kinfo.c index 0a8d4deeb6dc..8e67fb3a205f 100644 --- a/drivers/staging/android/debug_kinfo.c +++ b/drivers/staging/android/debug_kinfo.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "debug_kinfo.h" /* @@ -163,7 +164,10 @@ static int debug_kinfo_probe(struct platform_device *pdev) info->mod_core_layout_offset = offsetof(struct module, core_layout); info->mod_init_layout_offset = offsetof(struct module, init_layout); info->mod_kallsyms_offset = offsetof(struct module, kallsyms); -#if defined(CONFIG_MODULES) && defined(MODULES_VADDR) +#if defined(CONFIG_RANDOMIZE_BASE) && defined(MODULES_VSIZE) + info->module_start_va = module_alloc_base; + info->module_end_va = info->module_start_va + MODULES_VSIZE; +#elif defined(CONFIG_MODULES) && defined(MODULES_VADDR) info->module_start_va = MODULES_VADDR; info->module_end_va = MODULES_END; #else