From nobody Fri May 10 07:49:29 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 4VbLcn2Qcwz5L5G4; Fri, 10 May 2024 07:49:29 +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 4VbLcn1yF4z429J; Fri, 10 May 2024 07:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715327369; 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=JyVGfj+zd+aiUMe1XJNktaS0v/ES4EqipaKPZjLVqj4=; b=hyZxhq4Hv6tsX/tSlMJEh30Vc5OAl8CRFw9Oxui+tB+Ce+kiCrZbILDRdLbp/VKdsDt4/l jIjE/SS2YrKqt0OgJbOHfedhrFrnzyqFvsaebgRhQAlvJV+4/hjSRISzoA7QKouC7+5nyL AuEhJVtuIVib7/ftq9ZSXekDX8FkG8tZ31Iz/9fVe+XlzwN10mUttNenpYq6s2cinUUzMN F/C7KUoaKSjHg+KXUN1+akk3wlCgG/4eown7OCsbnI/2B2q1LjnOo+kRD6gXMOVKUUDTos MRVs5bFZHyrd2AtfUGKZ+ff2tbo87Shs64a+nWewZHMGUbqyTmcYGyfupRr7sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715327369; a=rsa-sha256; cv=none; b=ngLaPzBh6UgYutSRSUKcLRYDBSTFISZaRy0caXs5shzEUwgMKIdmjmo6JMH1HUMQFbC7fn y+KmtqN3C+NgGIy3Rd46o2ftcj8Y5or6TI86HGYv5MJ9TUO6vX18CWlz2969fcQutVtV3E qF2QLgwzLAz56/GRvyQHszGpBXzr8n15JjlGTYNNLfkp3eEPNzt0UtA+JmTwa0qdybWyJn QBTyA8h+m0RnGgRMZoMFi+j4jDbgc8WG1c+5RZQcUz5itS/r6/2yqp8sn01wVUmpleq/NH E7MFxxMgLeS9J+iZPeZ4u8OSm4HMi30Amqtf5yFdMHjVOY3ZBT/RHvI/Ca6udQ== 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=1715327369; 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=JyVGfj+zd+aiUMe1XJNktaS0v/ES4EqipaKPZjLVqj4=; b=Ubul+F0MOnVaXK+9A0UyRT38TwE/+ukTNsOqpR9GAhNb8yhDre6iaRpViU6A9O8fvitstr rLGyLSRPsOaivfBsB+4GVxzeju0/Y3oZaOW9u83B4crhtq4rhuQ9DZi0TWvIl5Cx4NPc2+ 3s8mT7TRiAoMqAs7ewB2dwY8w1UIrpOdjNDNIfiBxwEIJ3ugOM6zdKjzC3oGBr0AwIyoYL 7k7ZD+F1JhKfSJd4owqNhLiRATE8gxNEonhM9gyfwMP3Kx35uYnWjZPTVgvKkZtfAWgLww 0R0eMpSugT1BM0xzYeElhGQ0UDNgaRTgytd+6rqbI0xYCq8Vfex5R7hyPRaTcw== 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 4VbLcn1Y5bzSRL; Fri, 10 May 2024 07:49:29 +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 44A7nTVs011329; Fri, 10 May 2024 07:49:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44A7nTbe011326; Fri, 10 May 2024 07:49:29 GMT (envelope-from git) Date: Fri, 10 May 2024 07:49:29 GMT Message-Id: <202405100749.44A7nTbe011326@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: 6a8ca2ff5338 - stable/14 - __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/14 X-Git-Reftype: branch X-Git-Commit: 6a8ca2ff53389c36233e5e0b1576696d34b74407 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a8ca2ff53389c36233e5e0b1576696d34b74407 commit 6a8ca2ff53389c36233e5e0b1576696d34b74407 Author: Konstantin Belousov AuthorDate: 2024-05-03 09:32:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-10 07:49:10 +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 f95384b30347..3123bd12dca8 100644 --- a/lib/libc/stdlib/cxa_thread_atexit_impl.c +++ b/lib/libc/stdlib/cxa_thread_atexit_impl.c @@ -102,7 +102,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