From nobody Mon Jul 21 05:30: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 4blprn1H5Yz6293t; Mon, 21 Jul 2025 05:30: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4blprn0V85z3vrZ; Mon, 21 Jul 2025 05:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753075833; 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=l8LqzOkoAvX49lw9u5QG+UFhY2vDYbCeFrrfOqUxv2Y=; b=e4TIW2Bz4SjIAlZNb7sTljGDxMDyiSHkEyIKBzBYrJJHgCgBV4v3HFQ5QFkqce37kh6+WV Fbu13cWvCisrC9DTj1GzjdggefYS8Qhocnk0LnS+tglSbv3Jd9GD0ZqpiAeWKJNanoU+sj a32JyJcy/lZGnp8O0wAJCIaXjUAiRyPgSJqEPVdMPhs1K2ZGKFgjERn9ZdD42N9oK3zYAW REdDQx7iSpiLMFhTb1u9CJk/dXzh2ys85G+kc4F2fj4lQDSAkEl+OTX5xFqqygPW3hJkkv bA2eXKt61hpt6MdCNPhxKFcdi4tTT77TJ7ySNiJwKAhA4qLcUrnl+HJ+UoeSTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753075833; 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=l8LqzOkoAvX49lw9u5QG+UFhY2vDYbCeFrrfOqUxv2Y=; b=k6scpcIXW1uDefDpCIzpzIytpLd7XwAnmRXXpQVHZgznh8gFdFQ7iXTQmDIgjdXN+oEidL AiGUm5o35C2Fu+pMu+Nb5ZEntI9gyFXPwUo6/q4dlOTwWrjrqoadx0XMA87xQZjs2A1x0T tSlCXLE0hOQzUy9z2HD3pOI5jQGTEAzYCxvbhBVoJmu+Ykxf7pkXzukvmeE7gmRSnkaV1y ZHqrVCbTpIvh0R22f2lBug2cEAKKDEm2misfFW8e0ONKm0sCUmp0TwK7O82ZV1iP0C01Gu Q4LnnxsAGnT5GQG30kiiUmTbrQFRiXw+yNtqVvRe7e9hncyw7IkI8PPL4TYklQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753075833; a=rsa-sha256; cv=none; b=F1pp1Kun3Tc41wg4uX7iRJg4daPrL66a5wqWI9w9uisAU9OlCSOIN85uv5cNbeYO8fAuVu hD+uDGNlLQcigk0cOuLYVrARO3xTDNowMK0PYZJUeZLEAoUF7Iz5zmal1jDYTAZmCABcc2 8v0uxpJe2JP3/2vxZn5C1FqZV4wm6OP4v/GUDwP2w8GpmD3ldsBas9Rog71wcIv4d20+8Y Ik35UYjIjcsjC4TfW+fZcjPqcTc3XKTngU1lr6mvmCR3GKYDAd3+2qGJaR1evNKMJ1F+H7 D5LGbcFRhWA4oO4u/PZHSXofepy7yb/gGGmh63WCOicZFfCl6CrxdWNROxZk0g== 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 4blprn03yHzlRv; Mon, 21 Jul 2025 05:30:33 +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 56L5UWfJ084330; Mon, 21 Jul 2025 05:30:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56L5UWoJ084327; Mon, 21 Jul 2025 05:30:32 GMT (envelope-from git) Date: Mon, 21 Jul 2025 05:30:32 GMT Message-Id: <202507210530.56L5UWoJ084327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: db9ef9d5f517 - main - rtld: do not relocate tlsinit address twice 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db9ef9d5f517a14160bb3d0a599b8392e01fb400 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=db9ef9d5f517a14160bb3d0a599b8392e01fb400 commit db9ef9d5f517a14160bb3d0a599b8392e01fb400 Author: Konstantin Belousov AuthorDate: 2025-07-21 04:09:53 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-21 05:29:05 +0000 rtld: do not relocate tlsinit address twice The addend for PT_TLS p_vaddr value should be obj' relocbase and not mapbase. It does not matter for dso which is linked at the address zero, but for executables in direct-exec mode with non-zero link address mapbase is already at the link base. Then, adding mapbase to phtls->p_vaddr adds twice as much relocbase offset as needed. PR: 288334 Reported by: Jordan Gordeev Reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51448 --- 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 04d17072af77..c6a98b50a165 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -337,7 +337,7 @@ map_object(int fd, const char *path, const struct stat *sb, bool ismain) 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; if (note_start < note_end)