Remove check for the relocation type check in the resolver,

from all archs.

Signed-off-by: Jiri Olsa <olsajiri@gmail.com>

diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index 3753112..197975e 100644 (file)
--- a/ldso/ldso/arm/elfinterp.c
+++ b/ldso/ldso/arm/elfinterp.c
@@ -44,7 +44,6 @@ extern int _dl_linux_resolve(void);
 
 unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        char *symname;
@@ -58,19 +57,12 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
        rel_addr = (ELF_RELOC *) tpnt->dynamic_info[DT_JMPREL];
 
        this_reloc = rel_addr + reloc_entry;
-       reloc_type = ELF32_R_TYPE(this_reloc->r_info);
        symtab_index = ELF32_R_SYM(this_reloc->r_info);
 
        symtab = (Elf32_Sym *) tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *) tpnt->dynamic_info[DT_STRTAB];
        symname = strtab + symtab[symtab_index].st_name;
 
-       if (unlikely(reloc_type != R_ARM_JUMP_SLOT)) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
-                       _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of jump instruction to fix up */
        instr_addr = ((unsigned long) this_reloc->r_offset +
                (unsigned long) tpnt->loadaddr);

diff --git a/ldso/ldso/bfin/elfinterp.c b/ldso/ldso/bfin/elfinterp.c
index ac24337..329c419 100644 (file)
--- a/ldso/ldso/bfin/elfinterp.c
+++ b/ldso/ldso/bfin/elfinterp.c
@@ -40,7 +40,6 @@ USA.  */
 struct funcdesc_value volatile *__attribute__((__visibility__("hidden")))
 _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        ElfW(Sym) *symtab;
@@ -55,19 +54,12 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry)
        rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
 
        this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
-       reloc_type = ELF_R_TYPE(this_reloc->r_info);
        symtab_index = ELF_R_SYM(this_reloc->r_info);
 
        symtab = (Elf32_Sym *) tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *) tpnt->dynamic_info[DT_STRTAB];
        symname= strtab + symtab[symtab_index].st_name;
 
-       if (reloc_type != R_BFIN_FUNCDESC_VALUE) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
-                           _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of GOT entry fix up */
        got_entry = (struct funcdesc_value *) DL_RELOC_ADDR(tpnt->loadaddr, this_reloc->r_offset);
 

diff --git a/ldso/ldso/cris/elfinterp.c b/ldso/ldso/cris/elfinterp.c
index 7c71df8..5bed669 100644 (file)
--- a/ldso/ldso/cris/elfinterp.c
+++ b/ldso/ldso/cris/elfinterp.c
@@ -41,7 +41,6 @@ extern int _dl_linux_resolve(void);
 unsigned long
 _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        int symtab_index;
        char *strtab;
        char *symname;
@@ -55,19 +54,12 @@ _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
        rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
 
        this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
-       reloc_type = ELF32_R_TYPE(this_reloc->r_info);
        symtab_index = ELF32_R_SYM(this_reloc->r_info);
 
        symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
        symname = strtab + symtab[symtab_index].st_name;
 
-       if (unlikely(reloc_type != R_CRIS_JUMP_SLOT)) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
-                           _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of the jump instruction to fix up. */
        instr_addr = ((unsigned long)this_reloc->r_offset +
                      (unsigned long)tpnt->loadaddr);

diff --git a/ldso/ldso/frv/elfinterp.c b/ldso/ldso/frv/elfinterp.c
index df41f97..75fd20c 100644 (file)
--- a/ldso/ldso/frv/elfinterp.c
+++ b/ldso/ldso/frv/elfinterp.c
@@ -26,7 +26,6 @@
 struct funcdesc_value volatile attribute_hidden *
 _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        Elf32_Sym *symtab;
@@ -42,7 +41,6 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry)
                                  tpnt->loadaddr);
 
        this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
-       reloc_type = ELF32_R_TYPE(this_reloc->r_info);
        symtab_index = ELF32_R_SYM(this_reloc->r_info);
 
        symtab = (Elf32_Sym *)(intptr_t)
@@ -51,12 +49,6 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry)
        strtab = DL_RELOC_ADDR (tpnt->dynamic_info[DT_STRTAB], tpnt->loadaddr);
        symname= strtab + symtab[symtab_index].st_name;
 
-       if (reloc_type != R_FRV_FUNCDESC_VALUE) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
-                               _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of GOT entry fix up */
        got_entry = (struct funcdesc_value *)
          DL_RELOC_ADDR (this_reloc->r_offset, tpnt->loadaddr);

diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c
index 62e854d..94f7405 100644 (file)
--- a/ldso/ldso/i386/elfinterp.c
+++ b/ldso/ldso/i386/elfinterp.c
@@ -47,7 +47,6 @@ extern int _dl_linux_resolve(void);
 unsigned long
 _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        Elf32_Sym *symtab;
@@ -60,7 +59,6 @@ _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 
        rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
        this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
-       reloc_type = ELF32_R_TYPE(this_reloc->r_info);
        symtab_index = ELF32_R_SYM(this_reloc->r_info);
 
        symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];

diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c
index 8f7364f..106ad52 100644 (file)
--- a/ldso/ldso/m68k/elfinterp.c
+++ b/ldso/ldso/m68k/elfinterp.c
@@ -47,7 +47,6 @@ extern int _dl_linux_resolve(void);
 unsigned long
 _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        ElfW(Sym) *symtab;
@@ -60,19 +59,12 @@ _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 
        rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
        this_reloc = (ELF_RELOC *)(rel_addr + reloc_entry);
-       reloc_type = ELF_R_TYPE(this_reloc->r_info);
        symtab_index = ELF_R_SYM(this_reloc->r_info);
 
        symtab = (ElfW(Sym) *)tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
        symname = strtab + symtab[symtab_index].st_name;
 
-       if (unlikely(reloc_type != R_68K_JMP_SLOT)) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
-                           _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of the jump instruction to fix up. */
        instr_addr = (this_reloc->r_offset + tpnt->loadaddr);
        got_addr = (char **)instr_addr;

diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c
index 0ed2757..8d9b7c4 100644 (file)
--- a/ldso/ldso/mips/elfinterp.c
+++ b/ldso/ldso/mips/elfinterp.c
@@ -87,7 +87,6 @@ unsigned long __dl_runtime_resolve(unsigned long sym_index,
 unsigned long
 __dl_runtime_pltresolve(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        Elf32_Sym *symtab;
@@ -100,7 +99,6 @@ __dl_runtime_pltresolve(struct elf_resolve *tpnt, int reloc_entry)
 
        rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
        this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
-       reloc_type = ELF32_R_TYPE(this_reloc->r_info);
        symtab_index = ELF32_R_SYM(this_reloc->r_info);
 
        symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];

diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index eeb3250..52c1f2a 100644 (file)
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -127,13 +127,6 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
        debug_sym(symtab,strtab,symtab_index);
        debug_reloc(symtab,strtab,this_reloc);
 
-#if defined (__SUPPORT_LD_DEBUG__)
-       if (unlikely(ELF32_R_TYPE(this_reloc->r_info) != R_PPC_JMP_SLOT)) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocation\n", _dl_progname);
-               _dl_exit(1);
-       }
-#endif
-
        /* Address of dump instruction to fix up */
        reloc_addr = (Elf32_Addr *) (tpnt->loadaddr + this_reloc->r_offset);
 

diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c
index 6cb8e08..964b2ea 100644 (file)
--- a/ldso/ldso/sh/elfinterp.c
+++ b/ldso/ldso/sh/elfinterp.c
@@ -45,7 +45,6 @@ extern int _dl_linux_resolve(void);
 
 unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        Elf32_Sym *symtab;
@@ -59,19 +58,12 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
        rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
 
        this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
-       reloc_type = ELF32_R_TYPE(this_reloc->r_info);
        symtab_index = ELF32_R_SYM(this_reloc->r_info);
 
        symtab = (Elf32_Sym *)(intptr_t) tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
        symname = strtab + symtab[symtab_index].st_name;
 
-       if (unlikely(reloc_type != R_SH_JMP_SLOT)) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
-                           _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of jump instruction to fix up */
        instr_addr = (unsigned long) (this_reloc->r_offset + tpnt->loadaddr);
        got_addr = (char **) instr_addr;

diff --git a/ldso/ldso/sh64/elfinterp.c b/ldso/ldso/sh64/elfinterp.c
index 845ff4f..08b6311 100644 (file)
--- a/ldso/ldso/sh64/elfinterp.c
+++ b/ldso/ldso/sh64/elfinterp.c
@@ -47,7 +47,6 @@ extern int _dl_linux_resolve(void);
 
 unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        Elf32_Sym *symtab;
@@ -61,19 +60,12 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
        rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
 
        this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
-       reloc_type = ELF32_R_TYPE(this_reloc->r_info);
        symtab_index = ELF32_R_SYM(this_reloc->r_info);
 
        symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
        symname = strtab + symtab[symtab_index].st_name;
 
-       if (unlikely(reloc_type != R_SH_JMP_SLOT)) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump reloc\n",
-                           _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of jump instruction to fix up */
        instr_addr = ((unsigned long)this_reloc->r_offset +
                        (unsigned long)tpnt->loadaddr);

diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c
index 9b425fc..ce3991f 100644 (file)
--- a/ldso/ldso/sparc/elfinterp.c
+++ b/ldso/ldso/sparc/elfinterp.c
@@ -52,7 +52,6 @@ extern int _dl_linux_resolve(void);
 unsigned long
 _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        ElfW(Sym) *symtab;
@@ -70,19 +69,12 @@ _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
        reloc_entry = (reloc_entry >> 10) - 0xc;
 
        this_reloc = (ELF_RELOC *)(rel_addr + reloc_entry);
-       reloc_type = ELF_R_TYPE(this_reloc->r_info);
        symtab_index = ELF_R_SYM(this_reloc->r_info);
 
        symtab = (ElfW(Sym) *)tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
        symname = strtab + symtab[symtab_index].st_name;
 
-       if (unlikely(reloc_type != R_SPARC_JMP_SLOT)) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
-                                 _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of the jump instruction to fix up. */
        instr_addr = (this_reloc->r_offset + tpnt->loadaddr);
        got_addr = (char **)instr_addr;

diff --git a/ldso/ldso/x86_64/elfinterp.c b/ldso/ldso/x86_64/elfinterp.c
index e78a809..fb8051c 100644 (file)
--- a/ldso/ldso/x86_64/elfinterp.c
+++ b/ldso/ldso/x86_64/elfinterp.c
@@ -47,7 +47,6 @@ extern int _dl_linux_resolve(void);
 unsigned long
 _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        ElfW(Sym) *symtab;
@@ -60,19 +59,12 @@ _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 
        rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
        this_reloc = (ELF_RELOC *)(rel_addr + reloc_entry);
-       reloc_type = ELF_R_TYPE(this_reloc->r_info);
        symtab_index = ELF_R_SYM(this_reloc->r_info);
 
        symtab = (ElfW(Sym) *)tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
        symname = strtab + symtab[symtab_index].st_name;
 
-       if (unlikely(reloc_type != R_X86_64_JUMP_SLOT)) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
-                           _dl_progname);
-               _dl_exit(1);
-       }
-
        /* Address of the jump instruction to fix up. */
        instr_addr = (this_reloc->r_offset + tpnt->loadaddr);
        got_addr = (char **)instr_addr;

diff --git a/ldso/ldso/xtensa/elfinterp.c b/ldso/ldso/xtensa/elfinterp.c
index a459431..c97d554 100644 (file)
--- a/ldso/ldso/xtensa/elfinterp.c
+++ b/ldso/ldso/xtensa/elfinterp.c
@@ -35,7 +35,6 @@
 unsigned long
 _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        Elf32_Sym *symtab;
@@ -47,19 +46,12 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry)
 
        rel_addr = (char *) tpnt->dynamic_info[DT_JMPREL];
        this_reloc = (ELF_RELOC *) (rel_addr + reloc_entry);
-       reloc_type = ELF32_R_TYPE (this_reloc->r_info);
        symtab_index = ELF32_R_SYM (this_reloc->r_info);
 
        symtab = (Elf32_Sym *) tpnt->dynamic_info[DT_SYMTAB];
        strtab = (char *) tpnt->dynamic_info[DT_STRTAB];
        symname = strtab + symtab[symtab_index].st_name;
 
-       if (unlikely (reloc_type != R_XTENSA_JMP_SLOT)) {
-               _dl_dprintf (2, "%s: Incorrect relocation type in jump relocations\n",
-                                        _dl_progname);
-               _dl_exit (1);
-       }
-
        /* Address of the literal to fix up.  */
        got_addr = (char **) (this_reloc->r_offset + tpnt->loadaddr);