From nobody Wed May 7 19:22:05 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 4Zt4rs2NFdz5v9Bg; Wed, 07 May 2025 19:22:05 +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 4Zt4rs1mb6z49SK; Wed, 07 May 2025 19:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645725; 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=zlI1gF4qp0lC2uQFjfxwXRpsQug2qD3yEnh1Tn14szk=; b=e3pnkV4oiY8Y+3N6wruwunmy3G87jV561BL+KSKi8NYiwlKi4DZplBUJjrYIKe/rUrnVSF si/GjKKCUg0Fn6rs7siwYtSZBm4xTv9XmVAS2GEoo2gj3N/OaS1gmcRxpWe0Nea1fmKLe4 LDbZxv0Lh/S6g+KA582b6sVSarkT4Gt5VzHrTbCSGuPSgLeNZGBW77uL1Yjh7qyXrEP4zY StUS83SyoNqit9OeVEk9YY6V4aCbdpYLxwEoa59jcLnxqZpmcBKbi4Wx1JvC6Eqzd34K8R 8hVU/gYQ3mrbgOo7LWlcbBBPsAGqGABsZ5YRCyzx/FYZ6o/gdJKjDHvYK9sYaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645725; 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=zlI1gF4qp0lC2uQFjfxwXRpsQug2qD3yEnh1Tn14szk=; b=TtNz7THMiVEo7MLUQMwpUMmF5c74P61pIOec8Oh0TacL+W3tGWrIB07DRzfQ06DXMGT3/O fk/ZCimK5wTns0bVfz5EnVGc6gQ3G+/A6pUHi6m7NuUM19cJJmHgMKl1o99/PY8rI98PJp VM7Tk5N3BxTE786Pi8nXcJ6UyEcjBeZr20IU1Uyehzijze2mx2t80wUkF1VAFvh92JbCQL gmraL7ixJuCghdKRPY5JDfVtxEqc7n2KycG1s6q+VuZPzlurUa5Rx/ptUsYu/5UdlNcn4a N7Q/uztt6J42ttFMARQGm3fW0rnwk7tnEom26LkY+4oJdgBvrc52bak0ttQitw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746645725; a=rsa-sha256; cv=none; b=JYAY5UJkk/RHir4EoKbrSTXHQiUpMIX8IRqQtj1ZxsDCJWMgeVadDkpP/Xam5r9nQ+HvMS d9Mp1U7m+ieLhnnY8iloUfxtmSFD9P3pRHHIrD4eqjkmvHMtj7fskzDDnHL8Dgic2XwQO0 mqOlI1hHVMX+8/EZPtCH16U1XFW6as/VVycLAmPeqATyrluZ4ZKMTqMArxw0jqB8XbWE8d 6rz8jjebHLsQCYO59tlX7WnhVhyK3iHePsycbAMoQ7QaBBsRggkoKo/S+RCqJNJDYXS7s5 3GdMEu7i5KMqMD8pW15c4dPindaMcUqbPjZvcloSmj+kI6HneXoeGcqBMI5Xmw== 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 4Zt4rs1GqTzjkN; Wed, 07 May 2025 19:22:05 +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 547JM5Qw042927; Wed, 7 May 2025 19:22:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547JM5BV042924; Wed, 7 May 2025 19:22:05 GMT (envelope-from git) Date: Wed, 7 May 2025 19:22:05 GMT Message-Id: <202505071922.547JM5BV042924@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: 7953cbaabe7c - main - libc: Reassociate pointer arithmetic in __libc_tls_get_addr 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/main X-Git-Reftype: branch X-Git-Commit: 7953cbaabe7c35d439f0222481a12ad52d0b0df0 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=7953cbaabe7c35d439f0222481a12ad52d0b0df0 commit 7953cbaabe7c35d439f0222481a12ad52d0b0df0 Author: Jessica Clarke AuthorDate: 2025-05-07 19:19:42 +0000 Commit: Jessica Clarke CommitDate: 2025-05-07 19:19:42 +0000 libc: Reassociate pointer arithmetic in __libc_tls_get_addr Rather than compute a biased pointer only to then un-bias it again, un-bias the offset before adding it to the DTV entry. This mirrors rtld-elf commit d71c97026366 ("rtld-elf: Push TLS_DTV_OFFSET into tls_get_addr_common's arguments") Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50224 --- lib/libc/gen/tls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c index 8d453eccb801..218cd1da92df 100644 --- a/lib/libc/gen/tls.c +++ b/lib/libc/gen/tls.c @@ -85,8 +85,8 @@ __libc_tls_get_addr(void *vti) dtv = _tcb_get()->tcb_dtv; ti = vti; - return ((char *)(dtv[ti->ti_module + 1] + ti->ti_offset) + - TLS_DTV_OFFSET); + return ((char *)dtv[ti->ti_module + 1] + (ti->ti_offset + + TLS_DTV_OFFSET)); } #ifdef __i386__