From nobody Fri May 10 07:49:54 2024 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 4VbLdG46cNz5L5YT; Fri, 10 May 2024 07:49:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VbLdG3PYrz42wL; Fri, 10 May 2024 07:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715327394; 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=2alVYmTPO2/e602tHHutN3o8ml2MlJA57vaU4NMx/Wc=; b=MYV7glt2RyIAvsDwALdnrHKjBTH8pMLRigRAq2+PS9t7G1SAOwkNaWIaFm87M25rEx3npc 00zNosVi3Y2Yt7VuLN2NVtNXLk+KpqrSQPpkkrikY4NwHex5G+B2iVIcB0dWzRBOBqUYR2 edaxSewKwKuxsU3k5ZCzWZEWxbkRH08vV+IDsfJ7zwyH4mSf+RrStK+AM1eWlxCnsB501T uejFJsN3ZDfmhvw27do708B7k1i+bx0rm44+A5+30muhT+PI1hDHW6tld0wUcdfp5hqBbH U5fC1TMpU818FbjEu22SfmsNm8qeh42jEm0+faFFp7FpquSV8a9JRmmXyrc7BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715327394; a=rsa-sha256; cv=none; b=jt8SiTeEtOpDUOxR8KJrHx+25sOv6RcNWYC76TXi8eMBI7wVR93DPbvEo9XYnsrqk1tK07 Ks8r+1kyn4553yNTK0yPIf12ERMVxO2bRjc6bxa6r68bLBjBx67D/4aKYqN2bELc/MdKmT tY31XEqK+l/dQ4s82eMOtu4IrOB+qkSk+Fy+C1KzVL1yA8G4i6s/cI7xPC89ZHwKmsF3qW bVgDtVOrE/0Lc1G1K32y8OM44xOJMZ1S8TVxN0TL9xV/Yt307raSHOE6d9+hHfYz/7bxX4 Zr1npnUSdaZiv2I8Bw5nE2NIUWX6IFopH5y6pVld6D0B73MSHLBYdzbMifgF3A== 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=1715327394; 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=2alVYmTPO2/e602tHHutN3o8ml2MlJA57vaU4NMx/Wc=; b=u6PU/S+YvrbF2VXHWeOaUWOIjgYze4Xcm2r8nQ6aQKM9B1mohHRy15my5LVsfWaJ12CKlN 2H7fN1lvdZLaWQVmCCrKq6th3qGm4CALbbFFASrg+yjEm4BrPOjIZKbnv/4m3XLKV5aA5L rNJxposJtJIQu5XSzayXSdFLL5PiOgGpOXvCRQTk7vC2FXXhyWKQaDeAnMJkJ2vXl3A49C s2Gt5dXt5SuFf3loiUQSm266QzTr6sdznMpBih/8n7ZUUbLyS8jqhIy736edCS3WEWpuPM dLMZzuCpBPIKru03zQ4Q9ZI8T1gC0d0/N+XIRUjEKO8V1Sw044fOMt/Mk/GwCw== 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 4VbLdG30cgzSp0; Fri, 10 May 2024 07:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44A7nsL0011524; Fri, 10 May 2024 07:49:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44A7nsNH011522; Fri, 10 May 2024 07:49:54 GMT (envelope-from git) Date: Fri, 10 May 2024 07:49:54 GMT Message-Id: <202405100749.44A7nsNH011522@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: 5cf78a550034 - stable/13 - __cxa_thread_call_dtors(3): fix dtor pointer validity check 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/13 X-Git-Reftype: branch X-Git-Commit: 5cf78a5500345340771f7eb840724c2422b2ff96 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5cf78a5500345340771f7eb840724c2422b2ff96 commit 5cf78a5500345340771f7eb840724c2422b2ff96 Author: Konstantin Belousov AuthorDate: 2024-05-03 09:32:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-10 07:49:36 +0000 __cxa_thread_call_dtors(3): fix dtor pointer validity check PR: 278701 (cherry picked from commit b27eb9ce96b838622e125fd969e8dc4914aabe18) --- lib/libc/stdlib/cxa_thread_atexit_impl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/cxa_thread_atexit_impl.c b/lib/libc/stdlib/cxa_thread_atexit_impl.c index 2ebf20ef7fd9..ef9f3567d483 100644 --- a/lib/libc/stdlib/cxa_thread_atexit_impl.c +++ b/lib/libc/stdlib/cxa_thread_atexit_impl.c @@ -103,7 +103,7 @@ walk_cb_call(struct cxa_thread_dtor *dtor) { struct dl_phdr_info phdr_info; - if (_rtld_addr_phdr(dtor->dso, &phdr_info) && + if (_rtld_addr_phdr(dtor->func, &phdr_info) && __elf_phdr_match_addr(&phdr_info, dtor->func)) dtor->func(dtor->obj); else