Date: Mon, 20 Jul 2020 17:04:26 +0000 (UTC) From: Leandro Lupori <luporl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r363372 - stable/12/libexec/rtld-elf Message-ID: <202007201704.06KH4QeN016209@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luporl Date: Mon Jul 20 17:04:25 2020 New Revision: 363372 URL: https://svnweb.freebsd.org/changeset/base/363372 Log: MFC r362958 Handle non-PLT GNU IFUNC relocations in rtld Modified: stable/12/libexec/rtld-elf/rtld.c Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/rtld-elf/rtld.c ============================================================================== --- stable/12/libexec/rtld-elf/rtld.c Mon Jul 20 16:51:18 2020 (r363371) +++ stable/12/libexec/rtld-elf/rtld.c Mon Jul 20 17:04:25 2020 (r363372) @@ -3064,7 +3064,8 @@ resolve_object_ifunc(Obj_Entry *obj, bool bind_now, in return (0); obj->ifuncs_resolved = true; if (!obj->irelative && !obj->irelative_nonplt && - !((obj->bind_now || bind_now) && obj->gnu_ifunc)) + !((obj->bind_now || bind_now) && obj->gnu_ifunc) && + !obj->non_plt_gnu_ifunc) return (0); if (obj_disable_relro(obj) == -1 || (obj->irelative && reloc_iresolve(obj, lockstate) == -1) || @@ -3072,6 +3073,8 @@ resolve_object_ifunc(Obj_Entry *obj, bool bind_now, in lockstate) == -1) || ((obj->bind_now || bind_now) && obj->gnu_ifunc && reloc_gnu_ifunc(obj, flags, lockstate) == -1) || + (obj->non_plt_gnu_ifunc && reloc_non_plt(obj, &obj_rtld, + flags | SYMLOOK_IFUNC, lockstate) == -1) || obj_enforce_relro(obj) == -1) return (-1); return (0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007201704.06KH4QeN016209>