From 38f4e2d7110bfae63a4798d99401a0778833d9ad Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Jul 2020 14:46:55 +0200 Subject: [PATCH] Revert "ANDROID: x86, relocs: Ignore __typeid__ relocations" This reverts commit 0f53669f197d8e459a5d69739ec5d889ea814be3 as CFI is being removed from the tree to come back later as a "clean" set of patches. Bug: 145210207 Cc: Sami Tolvanen Cc: Kees Cook Signed-off-by: Greg Kroah-Hartman Change-Id: I3a6e4c20d1ee4c084fe44aee733e3a2fa19bc7ef --- arch/x86/tools/relocs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index fe89ab4aca44..ce7188cbdae5 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -48,7 +48,6 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { "^(xen_irq_disable_direct_reloc$|" "xen_save_fl_direct_reloc$|" "VDSO|" - "__typeid__|" "__crc_)", /* @@ -809,12 +808,6 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym, symname); break; - case R_X86_64_8: - if (!shn_abs || !is_reloc(S_ABS, symname)) - die("Non-whitelisted %s relocation: %s\n", - rel_type(r_type), symname); - break; - case R_X86_64_32: case R_X86_64_32S: case R_X86_64_64: