From nobody Tue Jan 28 23:27:24 2025 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 4YjLzc3GCRz5mL5q; Tue, 28 Jan 2025 23:27:24 +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 4YjLzc2jsDz3RpR; Tue, 28 Jan 2025 23:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738106844; 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=CaTkJJ8vTXx+dMF2CzhBX/E9vP7tyVTpHQyP360V1mE=; b=rrhV76Yaa427GBURIu746r317wo2KObohKgVeqWHvx/EBh9LFNy7/kktvvVr6EhTOq20wv U5tOs/yhgqQZx2mySYhHEpw6C56v5xeommCs9hQjEJrCyZLhSw5gyuL2m7q7Ph7/TyrCJt 8nJDsEvxcSsCDvmKORAb9SoHn5xcD6YaX1AORaFTIwyU9LZ5k4qBHYq9aNzNuJgZtFt+7e GL0HXTj8DOoRDx1IzrZ7+cV3pQMI4AY8lulbLrPryJOgqJcKLtBU8/IcvLp16l4n7BzZu3 gK2NMQBXb5SmDBHMnPir+zqdR7n4/bjmC6nieo37QTbAf91IYjjqSNvVsR/5pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738106844; 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=CaTkJJ8vTXx+dMF2CzhBX/E9vP7tyVTpHQyP360V1mE=; b=DW6yjC9e5ZuZwjylZzSeOclfr3nN8EpSAYknV5x7AdZi0LlBu+m/qrL/jY/g5zgpcvOt0p 3YQnqYQCFrgG0A421oV7Iffa2CUke3Kagk10bWW4knmr420neuof7XJ02fu0VGm0MkkxjX m0woDXkb00fPFBBECTinfXujFYpeJhU+AXyk50YOmSjjs20900ZU/lH48ZEkwuKzrua5fm 8a0cetJhCdbvWbd6AUpvY2p0av93ba4kG3zahc6x4IS0S+h2sGeu+a2hR9Mqyn8/UN04TW Djh6+ms/MO/rjGaFZhTlF32k+tgZdLJFyc9/+9qFE4QltwjdDDf3W/pLywkd2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738106844; a=rsa-sha256; cv=none; b=QfaIlOvwbBS7sLRsrHQPFJ4r5NMlI9Dj3P/6LL7kXbPbcsD77rmfLoNx6I9LI6D1/6GW/k VSI5sJWAKLeXYV2ecXzEHhLD2b+tdm4tFZk1D5Jhf5jBdP75xC/O2U9ZImM3R5cqjnDOZv 7LJgOs7aOSTsQidEfs1wHa+b5yKwkYHf2Qh8UMuJ46rGTZJmIJTH+3FauYSRMOOWZAO8Pz sgflTeXrMH5HQRkOGCe5WTLcuuKZ3pWU3okpDDOUTi4/3zlYDFrMIXRwKB/x+vTLJNb95w Z0GnxXXnS3cpctPS9CquqLrEokfU3vDFWWnSxon9m9Jl6S7RPOiiHdHSRAnzZg== 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 4YjLzc2005zcZc; Tue, 28 Jan 2025 23:27:24 +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 50SNROu0076074; Tue, 28 Jan 2025 23:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SNRO2r076071; Tue, 28 Jan 2025 23:27:24 GMT (envelope-from git) Date: Tue, 28 Jan 2025 23:27:24 GMT Message-Id: <202501282327.50SNRO2r076071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6ee34bca48a9 - main - crtbegin: accurately check for the end of .dtors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6ee34bca48a9e0867d46b24a78855e225d46ddda Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ee34bca48a9e0867d46b24a78855e225d46ddda commit 6ee34bca48a9e0867d46b24a78855e225d46ddda Author: Konstantin Belousov AuthorDate: 2025-01-27 19:21:20 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-28 22:59:20 +0000 crtbegin: accurately check for the end of .dtors not relying only on the end section marker, but also checking for the section size when iterating. Reported by: kargl Analyzed by: dim Reviewed by: andrew, dim Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48700 --- lib/csu/common/crtbegin.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c index d6978859af4a..06fe990052f7 100644 --- a/lib/csu/common/crtbegin.c +++ b/lib/csu/common/crtbegin.c @@ -66,19 +66,27 @@ static crt_func __DTOR_LIST__[] __section(".dtors") __used = { (crt_func)-1 }; +extern const char startof_dtors[] __asm(".startof..dtors") + __weak_symbol __hidden; +extern const char sizeof_dtors[] __asm(".sizeof..dtors") + __weak_symbol __hidden; + static void __do_global_dtors_aux(void) { crt_func fn; + uintptr_t dtors_end; int n; #ifdef SHARED run_cxa_finalize(); #endif + dtors_end = (uintptr_t)&startof_dtors + (uintptr_t)&sizeof_dtors; for (n = 1;; n++) { fn = __DTOR_LIST__[n]; - if (fn == (crt_func)0 || fn == (crt_func)-1) + if (fn == (crt_func)0 || fn == (crt_func)-1 || (dtors_end > 0 && + (uintptr_t)&__DTOR_LIST__[n] >= dtors_end)) break; fn(); }