From nobody Fri Apr 24 15:29:11 2026 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 4g2H1g4f62z6bSDX for ; Fri, 24 Apr 2026 15:29:11 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2H1g2G3mz3D4h for ; Fri, 24 Apr 2026 15:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044551; 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=cXbUN7oQLKlo9fxilLRUIExTDXG3gq2cC1Jj+o1FLe8=; b=MiXteQ3r5fY/AcrabT0i9NGgeccJXSawakMfp7snwNYlxJIayfweUxCk91cvOiiKIobOqG O3ck3dWKxKAxRyE6vcVpBfSBFFOXXSsDcusUzGTWjsSzwoOTlpq/6fNuEqIftAbHdbfg8S 6/MFrzh6coc08nreUr5iizw1YLQMJzoALG0+4U3H6Mw3xJvcYqlyyfL69pL7OXYE3zdTHM IPVk7pgoKVvFpCSJWHP44O0oGjiAd0rDQzbSWrw/KnUPIbF89yKsYI0vyH2VYs9kJsdhkt Rz+0aC6bzoEQkvR2xLTOfjruQibrDy3+Ro97f/FLUEXJg8SP1whYNTX2jl6lEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044551; a=rsa-sha256; cv=none; b=EVJjjGlUEziTw1FhHUJ98iZBQrRYjysG8eTVAl82Dt4ExoUBzDeYjpJhfAL7ll82oS1PfS GAyNoVSV+9Q+1OBZRxWAoYbEPrIZQcaZxD9qQ0Nn9TeWFy8bdEP/EVTDRCUQnV6T4yIid6 V/rgEmXqRwHn/8RYyGBUw9aeqcRqIo3Bbab/66zpamHPSN4Gb00f86QDLfePPS1W1hJnzH ncUR9JQvespebkiiUs5eKxrdMk39e0lTbeKaBeEVC+P1KC5IVgktY0qMVT0gYsOEyKBIro mzoUlK6i/4SInDPC7v5RPfOGWPjjlLd8IHWOmHvpZAggqkcgdmhyS/Vpl0p9nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044551; 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=cXbUN7oQLKlo9fxilLRUIExTDXG3gq2cC1Jj+o1FLe8=; b=ipQrb2wDJmm1CbjHxyIN7Zj3svlGx6mnWbAQjOQpfMnLNEN0EahLbQQ+1TENyAxtgFue5W KlAeO0iO7bUDPbH9LUfNqhf2u3Wa8T9JvbNz4v69UIsV6nrjxeUHSIsvAPJsiA9qbdKX1+ QD4TrsUtiPe/OPIY6dOrXCeUK+gyUFvC6OshitzkQ+fFMXW363o4WR+iC9JmytHUFxSGvY Wd5rFDKIs/2IvlU3otH8STkJ+FfpyDsbZVaIsKOunLyv44gE4GlzEeS9u8FWE6SwxnYK06 dnXHYa/gU7N8g56kU+65ly5f6seizdY1jIo3SGWUNwH8+TwHFtCRloZY7EcTUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H1g1hznz17cH for ; Fri, 24 Apr 2026 15:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ab8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:29:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c57d2b6f97d2 - stable/15 - rtld: Use a helper variable to simplify a few lines 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c57d2b6f97d2b8c2dc67ab053f6bf1e006792309 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:29:11 +0000 Message-Id: <69eb8c47.33ab8.402787f5@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c57d2b6f97d2b8c2dc67ab053f6bf1e006792309 commit c57d2b6f97d2b8c2dc67ab053f6bf1e006792309 Author: John Baldwin AuthorDate: 2026-01-15 18:23:42 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:38 +0000 rtld: Use a helper variable to simplify a few lines Reviewed by: kib Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54507 (cherry picked from commit 6d6bf4a892d6be84ec59fce5419eab616bcabb40) --- libexec/rtld-elf/rtld.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 10b84246d4ce..8ae0685b02d9 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5560,7 +5560,7 @@ allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) char *addr; size_t i; size_t extra_size, maxalign, post_size, pre_size, tls_block_size; - size_t tls_init_align, tls_init_offset; + size_t tls_init_align, tls_init_offset, tls_bss_offset; if (oldtcb != NULL && tcbsize == TLS_TCB_SIZE) return (oldtcb); @@ -5618,11 +5618,10 @@ allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) obj->tlsinitsize); } if (obj->tlssize > obj->tlsinitsize) { - memset(addr + tls_init_offset + - obj->tlsinitsize, - 0, - obj->tlssize - obj->tlsinitsize - - tls_init_offset); + tls_bss_offset = tls_init_offset + + obj->tlsinitsize; + memset(addr + tls_bss_offset, 0, + obj->tlssize - tls_bss_offset); } dtv->dtv_slots[obj->tlsindex - 1].dtvs_tls = addr; }