From nobody Fri Jul 25 03:24:25 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 4bpCsP4cTsz62K1p; Fri, 25 Jul 2025 03:24:25 +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 4bpCsP3g6Dz3NQY; Fri, 25 Jul 2025 03:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753413865; 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=k4ZBU5hrgbl/C8C3oAHf+oWFcckoAtF49soZeDYo3Sg=; b=doB94s1noS0lm0n2qRxxupgCcF0QbV4lCa+8K7cYy/87B0IxLZekwA3i8KMhOv5+bxPZNU vVecixEefukT5M44FsmP24DOpGIHmmUHO+Zp5KoWhp61wzmTusimdy0SVYRg9Lj2rRwFH5 nWZu7Fi/l2MEblpvBaptMCcYdsrR2LO37T8CWqK48+yCCwuTDwk3TBTvYI9+cOlp/9o8LK zwKwUlB8VEp+UuUAwsKtI7XfWYLcWc7Rp5YJvynPW84tZ5K691Qhu7FmZfp49KbFB/mpjk eRbg54DNIP5tQRt54Yv1i2EW/ojd3hJK7DRMDre9c0iVuz8ld36BPrfatAlIAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753413865; 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=k4ZBU5hrgbl/C8C3oAHf+oWFcckoAtF49soZeDYo3Sg=; b=hhkCKmapCchXwx4Wa8gRehIBrNZ9qnLORTYlimPrcEMRu5+eFruKIUnze0dOpU+alvQX5S Fk2YbYotfKOGjvKHTZ6o5tJQLeJIOdjJPV8R9fmNDBcpK/ZQb6zBA/DyYJPk1xyy177ClW L5Nm53FlmivpS6UcO0lRCdW3B60cv82Ajdn4hev5BX3Jwp89U40agpK5MTstA1asqZhjve mOljAli7WOdFfEh5Pf7M38+dERiLZZ5wrYNPNzaxp7CWPaELswLFVE7I/MJ2uKYzX7LJ8u BFPVJzVcfa4/Nbo93xqisz0A7/T/m4yE+MNXuCcWsY6a93ocmrJrW4HwQLvHpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753413865; a=rsa-sha256; cv=none; b=qx8e+J3dBJ4/9v0UzUX+mgzPffeE60js/VADKzBK60LzTTwoun/McEyj11THsIfyu45jfh rXm1HLceBDK/l4imGvdTUqKR5UVOQ76Oxzlf1t4dOTpBiiRg19PdOXyBHF7itxn9OiAcJt a7ewnUAk4CHXQtesRu8YPT1Z9C4ptjeYmHR/72m/l7U0flsMUU75zzDQOCptrul0DkysIK xZpWSN8wxZG5TDQU0IUa5FeyLnlqHU1ENjB72sdJmIPAy1l9fgdGvCFc0sYd2lHntcStNX KH5EwYOAs+Bg7CBDepntbcpe5Ixpk5lN7qbzuOeO8+6yUFliz7Ew3frRIFw2cw== 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 4bpCsP3BzFzC17; Fri, 25 Jul 2025 03:24:25 +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 56P3OPZQ018448; Fri, 25 Jul 2025 03:24:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56P3OPgR018445; Fri, 25 Jul 2025 03:24:25 GMT (envelope-from git) Date: Fri, 25 Jul 2025 03:24:25 GMT Message-Id: <202507250324.56P3OPgR018445@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1c250e04505f - stable/14 - rtld: do not relocate tlsinit address twice 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1c250e04505f0d3e9b103fa22fe1cf103182a695 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c250e04505f0d3e9b103fa22fe1cf103182a695 commit 1c250e04505f0d3e9b103fa22fe1cf103182a695 Author: Konstantin Belousov AuthorDate: 2025-07-21 04:09:53 +0000 Commit: Konstantin Belousov 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);