From nobody Sun Oct 25 17:34:33 2026 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 4jCP5P42JRz6wptj for ; Sun, 25 Oct 2026 17:34: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jCP5P2bKBz3FtD for ; Sun, 25 Oct 2026 17:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792949673; 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=j7pMLf7wBiJEZNWA8mhO+HpfjPH/3VcVR1wxeP9HwZk=; b=mEQy5KJj3RYZUnKjKyAZToz6FTaJAr3IMQAepez96E4ygWjRmaenEUqAYDaLzDkQwqHPg2 CHicCWuKrqguACI2VFyPQsM7xXOMssfXCk61es4luZfJaLqqUiv+SHGEULUXSth1UC87tN lBHBMqKPrZ7wf5FUoiupFpbxbyKl7xQxf+45fjJyyUsKV8HyYm+HIhG/+IuZxV/GxeRbEh YgybgH36EJmABD2ZPrWsIlJT92Kbxo75aQ19GugdhPtromtP77YjCfjZA6jDuobcTCvgZE Aus20hl/+KcQWZJDZFW8xKDe1zR2XPfPgciCRdTpa7sv2c0/HH8pevLMODn+zA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792949673; b=nT982LUiAKiCXJH+PGc5cwOKpJq34mi+z/up81vkd36IUP3GV+5NNn6InP2lSiUtg5igY7 EFh8D6JEBPj12E0F/w4R7DQ6OdVRIhdYI+AX9dA6wL5LOiZG0MuB7++ErqcJSMrBkLxXqt 3hSgzAYFy2vfEF1ADJRPdpilsATbpR86oB6nbJwyyd4RClIJdWABt5BrafPkwm984/scCA sG9mdOqYRbkAKHj2zXAkib1Yw3TFsAaM0QzccG0ZcKUGzH9Y7zXgS4BOaiFsdzrW8C0NMV Drl0g/vSBjrk5KubECvyeKpriFvrx1S8kOE+8jydBFjjfMTIMpnPMnZ2sMivWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792949673; 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=j7pMLf7wBiJEZNWA8mhO+HpfjPH/3VcVR1wxeP9HwZk=; b=lci+wiiM58+OTkaDmlINS02AIGSHP9A2Ab+yq2P8FjcZFJ9pP4Gjq2fSpWgYS2siGgVPZZ I+UZnAxfseSLwiiD67zh3Axc4HJeDEKsl0pOpD9+xL8/QeWmKc41o6qIBTrqIFpT8jzx3Q iNnZfNXU9ksnzR+TMGnfzYiYUdMAd6PxJPAn5vtJ5UEJyG9D2EQr4+WSBpxzhfQ+e/70e4 36VKneXlAvsC6xVpk+a/JLw0tiX/nYDeonNoLiKsUF2cRt74Ivvh6XkgXalXVCpfE4riI4 fX4VL92ZhsGawL9YV1SdViBsdnQ1RyqTHXHXxyBlruJvDNceSCTnhAL2N44eSw== 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 4jCP5P2FmvzxLP for ; Sun, 25 Oct 2026 17:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20fc5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Oct 2026 17:34:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 175595ba6c52 - main - dl_iterate_phdr(3): do not return garbage for objects not using TLS List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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/main X-Git-Reftype: branch X-Git-Commit: 175595ba6c5253e395c028e792787dffd2875910 Auto-Submitted: auto-generated Date: Sun, 25 Oct 2026 17:34:33 +0000 Message-Id: <6ade3da9.20fc5.5faa46a6@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=175595ba6c5253e395c028e792787dffd2875910 commit 175595ba6c5253e395c028e792787dffd2875910 Author: Konstantin Belousov AuthorDate: 2026-10-25 15:35:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-25 17:33:46 +0000 dl_iterate_phdr(3): do not return garbage for objects not using TLS For objects without a TLS segment, tlsindex is zero. tls_get_addr_slow() then reads dtv_slots[-1], which is dtv_size, and returns it as the TLS address. Set dlpi_tls_data to NULL for such objects instead. Fixes: d36d68161517 ("rtld dl_iterate_phdr(): dlpi_tls_data is wrong") Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 877449296643..7ca5f9ada09f 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; }