D26701.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26701.diff
View Options

	Index: head/sys/kern/link_elf_obj.c
	===================================================================
	--- head/sys/kern/link_elf_obj.c
	+++ head/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);