From nobody Tue Feb 4 00:29:47 2025 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 4Yn44r4mn9z5mlwG; Tue, 04 Feb 2025 00:29:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yn44r0hyQz46vp; Tue, 04 Feb 2025 00:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628988; 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=OFnRiGCTSw4aDXYvtrL7pgGbja9tBMtwMMeiEfQP+a8=; b=grsGbLBCGGQoSkYxbcX0unywRERfUMNYrgiutTgpN6slQ4D4E0LwYJq7mUwffpNd5GuAsQ Wtot68Xkye37yRwymOweLGUfLOxVb+XKVBeZ+br6bUYPQ0KRSc35Ggf2HbweARtm2MUBZO i8qerM47osQxnj7zhN9YxT9r1hVnk+fsRGE6LoRRE4wUng/enNwwlrLUNJiTk5anw37nKJ 90w5MS0SbyngV1OVKHCBi0ZXzwZ0z7v6cRnHMCsxK4Yn3aahREyG0bqTDHJ5/2C0cte54q ZN7y67iiKYBw3pXyY0082ZGEg3qRnkr+qmgxeI/jXE2zkITb+u71kMKoMAjWqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738628988; 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=OFnRiGCTSw4aDXYvtrL7pgGbja9tBMtwMMeiEfQP+a8=; b=ibweVcxl0pDwVTk7/UXXKUhGJ0YCvT3yoeuRWTXSvoKLrvaN37OAUjPXA8GUsfo95T8AAm yRNTKXstRRp4X7YxRWL9Z7kWZfBFt4SJowv+HHiZTYYM1fL980S0zoVNb0btkBwPhFbEEu 05jZ6ScWbL9SAtmcoo9VGCAGKijP3FOnma81PAzqNWxwtoBQutBIC3SYQu65Tzm1ekqUmu XojhEKM7+paPq3IobswITrKvEGXfITmQ32JV9cUXzJiA2KUg/RP1H2jpw3SdvRd+uKYkQw iEA3ViKp9JyknA5iNNM8/CNgeDmPDGNdy4XP3pNvNBxHKsFMSUdKgRHVSMoM+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738628988; a=rsa-sha256; cv=none; b=gb5FUbPZ4zKfaSTmELS9HCNYelHIciSYfkB3axmDfIdD6P+c0P3XqoeZpCIKEHxyi5QZkm O1SW/iLGJ1+/6nvSemhibhy8WseJ9NWB9hU64k+cdjbrpfrXOkRdzPQudgpx1EqE4y37LN ulNIkwLb/wKmy64qr1d/544HnQg38B6jAauUkK/NH+gdZ03M0Db0zCmCRrKVMEpi0pTU2G mc/5/a757x6rYg48zNmXjWUUq241ZnOMlIRIqLhlkJhgCC9ePq/yjeOk1gC3BfnaHHVXn+ WclxUZgwAy3b3EBHJrw73vkO6xKMTQthRjIs2sUFXsnxsvy7isRq65HQjlBmkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yn44r0GyrzybZ; Tue, 04 Feb 2025 00:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5140TlGa097440; Tue, 4 Feb 2025 00:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5140TlTj097437; Tue, 4 Feb 2025 00:29:47 GMT (envelope-from git) Date: Tue, 4 Feb 2025 00:29:47 GMT Message-Id: <202502040029.5140TlTj097437@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: 40fb3c401e1d - stable/14 - crtend: accurately check for the start of .ctors 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: 40fb3c401e1d86dbf93c6d97ef1de9f600b76b81 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=40fb3c401e1d86dbf93c6d97ef1de9f600b76b81 commit 40fb3c401e1d86dbf93c6d97ef1de9f600b76b81 Author: Konstantin Belousov AuthorDate: 2025-01-27 20:38:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-02-04 00:28:37 +0000 crtend: accurately check for the start of .ctors (cherry picked from commit 21502f9a926c7e0c24ce230bb029fde4bf570a14) --- lib/csu/common/crtend.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/csu/common/crtend.c b/lib/csu/common/crtend.c index d9259729bb0e..bf25c1d836a9 100644 --- a/lib/csu/common/crtend.c +++ b/lib/csu/common/crtend.c @@ -21,7 +21,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "crt.h" typedef void (*crt_func)(void); @@ -45,15 +45,22 @@ static crt_func __DTOR_END__[] __section(".dtors") __used = { (crt_func)0 }; +extern const char startof_ctors[] __asm(".startof..ctors") + __weak_symbol __hidden; + static void __do_global_ctors_aux(void) { crt_func fn; + uintptr_t ctors_start; int n; + ctors_start = (uintptr_t)&startof_ctors; for (n = 1;; n++) { fn = __CTOR_END__[-n]; - if (fn == (crt_func)0 || fn == (crt_func)-1) + if (fn == (crt_func)0 || fn == (crt_func)-1 || + (ctors_start > 0 && + (uintptr_t)&__CTOR_END__[-n] < ctors_start)) break; fn(); }