From ab881b49ef9bd8872f256ace8566ba4f631bbf71 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Jul 2020 14:45:17 +0200 Subject: [PATCH] Revert "ANDROID: x86, module: Ignore __typeid__ relocations" This reverts commit 25776752e719f52ffda188931a86168617227166 as CFI is being removed from the tree to come back later as a "clean" set of patches. Bug: 145210207 Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: I74cdda3e07f165923ad628154c4e76fed4a914e0 --- arch/x86/kernel/module.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index 506928b06af5..34b153cbd4ac 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c @@ -196,10 +196,6 @@ static int __apply_relocate_add(Elf64_Shdr *sechdrs, val -= (u64)loc; write(loc, &val, 8); break; - case R_X86_64_8: - if (!strncmp(strtab + sym->st_name, "__typeid__", 10)) - break; - /* fallthrough */ default: pr_err("%s: Unknown rela relocation: %llu\n", me->name, ELF64_R_TYPE(rel[i].r_info));