From nobody Tue May 6 22:15:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsXlT4YYYz5vXYr; Tue, 06 May 2025 22:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXlT2HM5z3ctb; Tue, 06 May 2025 22:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746569733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jy9MwGgFpVEQFXusyZAmUsXkU0tuVYvyfs0knrvgO+8=; b=Xa3S6DLnSg34X2A5KOsEwWxD4oahXrZkMnq3cuLVlzWn/oT2FT9+txwvJGojJg3c4R8JQx vbJWVPmMMoV/+iSj+tcY7yq0mA+gvRKVqLmM6zS9T7ghLvpuvOtEA1yLZaE3Wu+4+h5mOi Hl6OCjRtXI8dfy68pkGxI1eibURPZvTd8twIFY17iRiizmzPfWcKZyI4LnN+nUv4VyYAP1 1eSigYI77mLQK4K0/sKA2ZZa3Vvyk6SShICHf4dVYh1eDxsb4JZAycLzi08wKt7kmAEH/m zJ8UpSVWZcbXFJ1GzVcFZxfJJ2aRNmDDrBxNRavPY2xLvSl3TLFZ31hCd0NIbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746569733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jy9MwGgFpVEQFXusyZAmUsXkU0tuVYvyfs0knrvgO+8=; b=MQD0JUdtgI6wK0yMSEEKg5YbL1WiJUZ3X2GydT85RAoYFIf9ae1wxUZgXjLA2oCEr1s0i3 3r8jYuuOOuWOwWKBV6EgivCGs16PGQZ4XI994texwuRNoqBWNOaKJ/tbE0ai964H9fIXAR a9EaywiT5PX6God+2afJOOKsciVb2R6cQtff9GSUVDd3GmX9HKaJP6UvyHC+USd1OU88uJ SabuFafI1LGGY9O5SWFtbQdwik7jvNArPDncKg40/TuqVvQaPoFJZ/+GZijL47yNcEPYpb PmD+AJmB/wvpwvd27Td6cxadKTZ9UpZafPBm3GUFRFv5mlgy0mkWszoIOQT9Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746569733; a=rsa-sha256; cv=none; b=buznwe9YPTDo4poD9PxnDxlSkkaEOHgOgzNxabtWYBH/IlP/oTZ/Q6K1jqc3oFz8VVA/10 vfZUBKl2v8dcWBse/o4Yn0wybb4lXZlEtpmIbR33yClMQJ+puM4XprDnHGJtk/kYYv/A4S j1mCl+t0qldBqxrbG/aoO3kcYmmAHF/YcZbnTxB+9cSaB9ANYhslFqAwuHuaE4cfrHXFCe HO43iFKGs28dugPcEZ+ts7Xgx260Qoyz/agTHwh5h2W0LfnxFUCT7M83VrwD0c/91h44Uy Fll+x91HMnlOMw6eZA9EpwAPQvG/ASB28OGNEVoPPAoFNL8JEV2ntmGhZ7CW+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsXlS5h54z1HHk; Tue, 06 May 2025 22:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546MFW8M063003; Tue, 6 May 2025 22:15:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546MFWH7063000; Tue, 6 May 2025 22:15:32 GMT (envelope-from git) Date: Tue, 6 May 2025 22:15:32 GMT Message-Id: <202505062215.546MFWH7063000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c02aaba1b454 - main - rtld-elf: Fix dl_iterate_phdr's dlpi_tls_data for PowerPC and RISC-V List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c02aaba1b4549c1c3b1481f7c935f6cc80b98e8d Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c02aaba1b4549c1c3b1481f7c935f6cc80b98e8d commit c02aaba1b4549c1c3b1481f7c935f6cc80b98e8d Author: Jessica Clarke AuthorDate: 2025-05-06 22:14:51 +0000 Commit: Jessica Clarke CommitDate: 2025-05-06 22:14:51 +0000 rtld-elf: Fix dl_iterate_phdr's dlpi_tls_data for PowerPC and RISC-V The implementation of dl_iterate_phdr abuses tls_get_addr_slow to get to the start of the TLS block, inlining the implementation of __tls_get_addr as if the tls_index's ti_offset were 0 (historically it called __tls_get_addr itself but changed due to locking issues). For most architectures, tls_index's ti_offset (relocated by DTPOFF/DTPREL for GOT entries) is just the offset within that module's TLS block. However, for PowerPC and RISC-V, which have a non-zero TLS_DTV_OFFSET and thus are designed assuming DTV entries are biased by that value, ti_offset normally has TLS_DTV_OFFSET pre-subtracted, but it's __tls_get_addr's responsibility to compensate for that. By using an offset of zero here, tls_get_addr_slow will return a pointer to the start of the TLS block itself, so by adding TLS_DTV_OFFSET we will point TLS_DTV_OFFSET past the module's TLS block. Fix this by removing the extra bias (the alternative would be to pass -TLS_DTV_OFFSET and keep the addition, which would more closely follow what __tls_get_addr does, but this is more direct). (Note this also applies to MIPS on stable/13) Reviewed by: kib Fixes: d36d68161517 ("rtld dl_iterate_phdr(): dlpi_tls_data is wrong") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50184 --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 29d32e54e690..e4e14edbb5c8 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4316,7 +4316,7 @@ rtld_fill_dl_phdr_info(const Obj_Entry *obj, struct dl_phdr_info *phdr_info) phdr_info->dlpi_tls_modid = obj->tlsindex; dtvp = &_tcb_get()->tcb_dtv; phdr_info->dlpi_tls_data = (char *)tls_get_addr_slow(dtvp, - obj->tlsindex, 0, true) + TLS_DTV_OFFSET; + obj->tlsindex, 0, true); phdr_info->dlpi_adds = obj_loads; phdr_info->dlpi_subs = obj_loads - obj_count; }