Date: Fri, 25 Jul 2025 03:24:25 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1c250e04505f - stable/14 - rtld: do not relocate tlsinit address twice Message-ID: <202507250324.56P3OPgR018445@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c250e04505f0d3e9b103fa22fe1cf103182a695 commit 1c250e04505f0d3e9b103fa22fe1cf103182a695 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-07-21 04:09:53 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2025-07-25 03:23:49 +0000 rtld: do not relocate tlsinit address twice PR: 288334 (cherry picked from commit db9ef9d5f517a14160bb3d0a599b8392e01fb400) --- libexec/rtld-elf/map_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c index 0b1500a15183..06be8c02137e 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -320,7 +320,7 @@ map_object(int fd, const char *path, const struct stat *sb) obj->tlsalign = phtls->p_align; obj->tlspoffset = phtls->p_offset; obj->tlsinitsize = phtls->p_filesz; - obj->tlsinit = mapbase + phtls->p_vaddr; + obj->tlsinit = obj->relocbase + phtls->p_vaddr; } obj->stack_flags = stack_flags; obj->relro_page = obj->relocbase + rtld_trunc_page(relro_page);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507250324.56P3OPgR018445>