Page MenuHomeFreeBSD

D26701.id77984.diff
No OneTemporary

D26701.id77984.diff

Index: sys/kern/link_elf_obj.c
===================================================================
--- sys/kern/link_elf_obj.c
+++ sys/kern/link_elf_obj.c
@@ -1676,9 +1676,11 @@
if (ELF_ST_BIND(sym->st_info) != STB_LOCAL)
continue;
if ((ELF_ST_TYPE(sym->st_info) == STT_GNU_IFUNC ||
- elf_is_ifunc_reloc(rel->r_info)) == ifuncs)
- elf_reloc_local(lf, base, rel, ELF_RELOC_REL,
- elf_obj_lookup);
+ elf_is_ifunc_reloc(rel->r_info)) != ifuncs)
+ continue;
+ if (elf_reloc_local(lf, base, rel, ELF_RELOC_REL,
+ elf_obj_lookup) != 0)
+ return (ENOEXEC);
}
}
@@ -1704,9 +1706,11 @@
if (ELF_ST_BIND(sym->st_info) != STB_LOCAL)
continue;
if ((ELF_ST_TYPE(sym->st_info) == STT_GNU_IFUNC ||
- elf_is_ifunc_reloc(rela->r_info)) == ifuncs)
- elf_reloc_local(lf, base, rela, ELF_RELOC_RELA,
- elf_obj_lookup);
+ elf_is_ifunc_reloc(rela->r_info)) != ifuncs)
+ continue;
+ if (elf_reloc_local(lf, base, rela, ELF_RELOC_RELA,
+ elf_obj_lookup) != 0)
+ return (ENOEXEC);
}
}
return (0);

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 26, 6:48 PM (16 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37320590
Default Alt Text
D26701.id77984.diff (1 KB)

Event Timeline