From nobody Sat Oct 31 03:18:56 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 4jGjqN4qRqz6xqbK for ; Sat, 31 Oct 2026 03:18:56 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGjqN3r0Fz56gJ for ; Sat, 31 Oct 2026 03:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793416736; 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=GdZhfb7NJRrTL80/E7PR+ddgKs7CiZbKiXPc4Zf1DHc=; b=jFOT0nTVk0LekOcAdcNNZOBhEH8NpSyi/12aVNQ86lPczIAXcn9GLoXuiarngFZXOB1bfX 5Seb9ckGnKGBJPTq++v6UTdPTyMfHs47Q6NGEzbEsPhPAI3Xh38/HUFImGVzMUfoYwCjWP 3CN1l2nS2q/6EOUpwftTq8MRJT65rcwb4j7zs3FLr8pd3SNyLr7Wyy/RTZCnNp+k2UtfF4 Z7ZTTHjaGPNONpCrCnWrm5bJTy1vqClwLELpmF4/4prCpy6HxfgE1KCDiDLIP2Hhggqieb FYcsffWmD+SL3NVU2rvF6VdxjGbl8sL+Gi1CoiA5DRckUB4G8bUuCUMFVRi31A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793416736; b=IXEdamgk6aSDPwUCjp7hq8CLTgoAOtyCTkkMnZnpgcU/Eo+qbQQFvSH9NXjSjpKKbIDRVb vU9+Ytv12bq1igTPleKE3hrtCgXikmO8n6sMSv08LwmbVBU8Mnc4XsBfLWMre4cfAg9j1W wzhNy77rOyysiNqZWpllQBKQnVb0dYGGLKI+Ae6bwqY+I3dUOvPaBlYf454OyMxCNIXnCE G1qEc+18VtaKb1Ioiif7k0ppkVorcd4JWlc25zj8xeU7O8Yjvo/i3R25NggH4JhyWeqywC v7XBIRFaCjV2rU6iJ767cS5mMzU3D2W6yVzCRDl66n8HA32+I5BTzAahHC7ZQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793416736; 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=GdZhfb7NJRrTL80/E7PR+ddgKs7CiZbKiXPc4Zf1DHc=; b=KO13bdJhj67x32eUrmYlEqMMjTkdiPJ9NtN1pnrSpzkAlN7V5Yvddzffn9QTCB5UPFHSHQ lt1+PZXOyV7oJtjj4nFeYoUOWHtsA2BUJ+gKaTFSbrPDoNvlvhol9hJZkvrOIsxCGnUXMp v7PwuF8b7J4CwIvIVaEIGCCQ5sCdOOj3EXRbfUbCd2v+YF/QNOndM4t9IQ/B9JDYgqJB37 O4ah1UUZNWMIzD1ZV0xzMj05Bvjd5nxjBoyFJhwd3zUe3BM9pROwS8MklUAxweoaXJGY0o +GahYnFrUEXzWSdKAZ3HLZKUppP5hxplS4cFG4QdrUQMsQ8KH7w/jKo4K4Kh2A== 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 4jGjqN3R4nzx1Y for ; Sat, 31 Oct 2026 03:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36dd5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 03:18:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f89814a2d968 - stable/15 - dl_iterate_phdr(3): do not return garbage for objects not using TLS List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: f89814a2d968df0e40d2ddbcb0863e24ea39bf94 Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 03:18:56 +0000 Message-Id: <6ae55e20.36dd5.265101b3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f89814a2d968df0e40d2ddbcb0863e24ea39bf94 commit f89814a2d968df0e40d2ddbcb0863e24ea39bf94 Author: Konstantin Belousov AuthorDate: 2026-10-25 15:35:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-31 03:15:23 +0000 dl_iterate_phdr(3): do not return garbage for objects not using TLS (cherry picked from commit 175595ba6c5253e395c028e792787dffd2875910) --- libexec/rtld-elf/rtld.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 74cfc2e34dfd..d2cd6c04a8a4 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4436,8 +4436,12 @@ rtld_fill_dl_phdr_info(const Obj_Entry *obj, struct dl_phdr_info *phdr_info) phdr_info->dlpi_phdr = obj->phdr; phdr_info->dlpi_phnum = obj->phnum; phdr_info->dlpi_tls_modid = obj->tlsindex; - phdr_info->dlpi_tls_data = (char *)tls_get_addr_slow(_tcb_get(), - obj->tlsindex, 0, true); + if (obj->tlsindex != 0) { + phdr_info->dlpi_tls_data = tls_get_addr_slow(_tcb_get(), + obj->tlsindex, 0, true); + } else { + phdr_info->dlpi_tls_data = NULL; + } phdr_info->dlpi_adds = obj_loads; phdr_info->dlpi_subs = obj_loads - obj_count; }