From nobody Mon Dec 15 17:00:23 2025 X-Original-To: dev-commits-src-all@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 4dVRBv2lZfz6L1sR for ; Mon, 15 Dec 2025 17:00:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVRBv1dJwz3pfv for ; Mon, 15 Dec 2025 17:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818023; 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=ZFy8H9y1N6NvoNJEOq4vish1KT/xXYyIUbFk75DN8Co=; b=J1o2S7qVLxUm9TwuITpR5O4ZIXu19m57OOETO2vez7SvNQVezDXrSZ+qgsDfgf4iP74IGM BZ9JZ9g7Hpedd40GwgQnY+/ojLCYYl75ZqiI6nTGFISFuCLHhZQY/Xu0vs/0Ej+MPBJR6U fyVooBRUzQ6tRouvI2a47+sKr5c4v5Fuwy7Xc99prCWgrd5sVAwIkk4LtzyiMckOAAp/7M kOHQzIACD4N5f4DF7YLKbFape9MR2TX80nUQQ03ATZCZCqbUmAXYZqzSl6cO4yVRA3HAfN FVzQSFRGyjYbb9GKTR+Shy/g3mNR2sl5OwXcOyvRs5x665+bnbLPoOVrRgT0Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818023; 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=ZFy8H9y1N6NvoNJEOq4vish1KT/xXYyIUbFk75DN8Co=; b=HIax7R63s8Y7ifZCiZ19WWKitr1kWHkhklH3GCY/82FNpQuowsnMzPfZi2ep7E6Bt6tub6 0GT2hPUpx4Jojuk8szzCzTAdZmr/4/PnB3W9cgDoHsDXRRmaOKBew/by25MgUkmguwEODZ ftrLvRDeokXmpgWKuC4Sv9ncleTY1YKWsQBc2SQwZpHKMap9ZvHnQY3FoRurTW3ciwapye NOZJPE4+VSdmhebXHxXQGyhEGrueNlBzML4b5zQwg5Bg0KCSERTPgFojPAfhtr9WeqyoNE on1ShFdtmPeKztZdzW/sEzP6gvBufHInnmoXUgS15aKU8pwdEShJoRWhI3wNFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818023; a=rsa-sha256; cv=none; b=m5xEXL0icz4oCZI75HLSJV1i8itdNLaIMiHFLD6mVqpLAuzwSJSi7EKdSB5D/gWYAsL7FI aK3cmAyZYWXThcfLoOT2Y3neRBcWfUEUp8Dj0D5MdbAeJBkQQdpYQVG3fBoB5CM4f17FzT tUxA3h0cn2BKHE/+b7NZtSCTXaH3wkJy4VX4YJ0qUCqu9Q3BTfztzBHizoAxXYRKkELWhs hrw8JjkEptZZljRwuDOxsI/P4DupLq1maKdsT+yGJItXp9j7sztGtzgJI46RuC7VDjIziz 5ozY9CXGxeyr6Adhcz2TtSeB27gOXV/oWwU2sLHfmgfiXVfcPSpuUBFRxPNjNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVRBv18r7zC69 for ; Mon, 15 Dec 2025 17:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e0a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: e73457d194b0 - stable/14 - rtld-elf: Fix dlsym(3) for TLS symbols on PowerPC and RISC-V List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: e73457d194b000a53218a77564730e87b84f66af Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:23 +0000 Message-Id: <69403ea7.e0a3.5e8628aa@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e73457d194b000a53218a77564730e87b84f66af commit e73457d194b000a53218a77564730e87b84f66af Author: Jessica Clarke AuthorDate: 2025-05-06 22:14:51 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 16:58:44 +0000 rtld-elf: Fix dlsym(3) for TLS symbols on PowerPC and RISC-V The implementation here is meant to mirror what a GOT entry for the given symbol would use for ti_offset. However, on PowerPC and RISC-V, TLS_DTV_OFFSET is non-zero, and so the GOT entries are normally biased by this, but we fail to do so here. As a result we end up getting a pointer TLS_DTV_OFFSET past where the variable actually is. (Note this also applies to MIPS on stable/13) Reviewed by: kib Fixes: 5ceeeba90c6c ("Import DragonFly BSD commit") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50183 (cherry picked from commit 8ad9cec3a2cc643020a286ee68f70eb01225fbdd) --- 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 8509321b785f..00e805c5c4c9 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4088,7 +4088,7 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve, sym = rtld_resolve_ifunc(defobj, def); else if (ELF_ST_TYPE(def->st_info) == STT_TLS) { ti.ti_module = defobj->tlsindex; - ti.ti_offset = def->st_value; + ti.ti_offset = def->st_value - TLS_DTV_OFFSET; sym = __tls_get_addr(&ti); } else sym = defobj->relocbase + def->st_value;