commit 3777f3811a7f55ae74707ccfc973b26bc09dd975
author Jone Chou <jonechou@google.com> Sun Jun 06 19:20:56 2021 +0800
committer Jone Chou <jonechou@google.com> Mon Jun 07 16:54:09 2021 +0800
tree fb831f135db8a30bc597a5fc8b3f0b458f9a574a
parent 1d0fb17cecd7bd1bd910595da9442b8469188dc9

ANDROID: kernel: Fix passing NULL to __pa_symbol()

If passing ZERO(NULL) to __pa_symbol() would trigger a BUG()
when CONFIG_DEBUG_VIRTUAL=y

Bug: 190334261
Signed-off-by: Jone Chou <jonechou@google.com>
Change-Id: I78837a268b7e340f2658e0b831c9f2b5453aa3f0

drivers/staging/android/debug_kinfo.c

diff --git a/drivers/staging/android/debug_kinfo.c b/drivers/staging/android/debug_kinfo.c
index 0975019e..69d5a49 100644
--- a/drivers/staging/android/debug_kinfo.c
+++ b/drivers/staging/android/debug_kinfo.c
@@ -135,14 +135,17 @@
 	info->bit_per_long = BITS_PER_LONG;
 	info->module_name_len = MODULE_NAME_LEN;
 	info->symbol_len = KSYM_SYMBOL_LEN;
-	info->_addresses_pa = (u64)__pa_symbol((volatile void *)kallsyms_addresses);
-	info->_relative_pa = (u64)__pa_symbol((volatile void *)kallsyms_relative_base);
+	if (!info->enabled_base_relative)
+		info->_addresses_pa = (u64)__pa_symbol((volatile void *)kallsyms_addresses);
+	else {
+		info->_relative_pa = (u64)__pa_symbol((volatile void *)kallsyms_relative_base);
+		info->_offsets_pa = (u64)__pa_symbol((volatile void *)kallsyms_offsets);
+	}
 	info->_stext_pa = (u64)__pa_symbol(_stext);
 	info->_etext_pa = (u64)__pa_symbol(_etext);
 	info->_sinittext_pa = (u64)__pa_symbol(_sinittext);
 	info->_einittext_pa = (u64)__pa_symbol(_einittext);
 	info->_end_pa = (u64)__pa_symbol(_end);
-	info->_offsets_pa = (u64)__pa_symbol((volatile void *)kallsyms_offsets);
 	info->_names_pa = (u64)__pa_symbol((volatile void *)kallsyms_names);
 	info->_token_table_pa = (u64)__pa_symbol((volatile void *)kallsyms_token_table);
 	info->_token_index_pa = (u64)__pa_symbol((volatile void *)kallsyms_token_index);