Revert "ANDROID: x86, relocs: Ignore __typeid__ relocations"

This reverts commit 0f53669f19 as CFI is
being removed from the tree to come back later as a "clean" set of
patches.

Bug: 145210207
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3a6e4c20d1ee4c084fe44aee733e3a2fa19bc7ef
This commit is contained in:
Greg Kroah-Hartman 2020-07-17 14:46:55 +02:00
parent ab881b49ef
commit 38f4e2d711

View File

@ -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: