From nobody Thu Nov 05 16:02:56 2026 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 4jL6Xj4WJlz70GkF for ; Thu, 05 Nov 2026 16:03:01 +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 4jL6Xj2qD6z4YC5 for ; Thu, 05 Nov 2026 16:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793894581; 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=Lvdde5zR53vANCzUcu41PNxTYk0XkbmYlKcTk8/j7ps=; b=uKFHAUpmNgHf6vm1o28gS0SrZ85OdwoJiUyiAO5626kwu1Gj/E7AEAL4b2RaMaJsfNjhwF XRVGLDEjiX2fu9ghKjeMjV5HBwSC8NBq+PB67hGgPEN6XLZPZSjwiG62yaN2SE+rpz+f5b eD8XVR0Qp+M5eWGGNldzn+dMhQEtcuXTOJDU+APereLZKQ0oRA02BI1+abz90a5HmDTF1b hGGvHE7LSj+FkmOtk59aqF8Xb0yL00qca3mUxjWiXRfHXuHkx4cgSCD+TLltdqc0v6SG4K iDdN1Ti9Zp2J9RBQSLtCsenwBBbHMQ30fzor6BvWbvaFaqD9/SXSGvVQdEg+tw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793894581; b=AQjsBdtqsdvJFbDTiD0bOkmzWceAICNIhffvwjHOo+FSY2Vhq+5WqYg/4kvY3dKt6n3kcR QKq3jdHs0cucqR4nmIGbIrSV8qp6MUBQ2E8i3n1RQ4GD9etMljak5mUw6myVqRL7+fOdGu JqQjPQQyqr4AOrxvLUVdM1HWfZrHi5LZ9dzQ8lcrbeoEpm5r8QODt5ku6m++YChXrwpeg7 b/jqRJZA7hIwpPAz4BDV/RdheGsDYK0PidMRjQvttWYG4McQD8pZwNyzJq+FJ4Oua8DhZx xDBui/O3syno3qaiMdAsS7Om2P+UAeuerIWEzguyje2KcEHpHXbvcUVUz2T/Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793894581; 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=Lvdde5zR53vANCzUcu41PNxTYk0XkbmYlKcTk8/j7ps=; b=ZFF2QQsods+CoIcInRqnaHzvV81iHaw48/3CtvO17lkOoYrwDLSnnJR2pJXSRfn/xl3jox BivgAm/jqRfsfOS3kwT5FSnwGPTK7ilgJZuQDrwV48bWmU4jQsDObUkoiujbdsHrTk0+g9 pJQAUVLw1+ALWj5/2CRv3UaCKVELODTnNlIv22j+zVh6gzpxi1Imb4yqAEtf9B1cQGbV/J 0BKPupeteClj/F+zgt3YVoNz04dra+SaSq2Dk/DK6GCm46Qsj6um+53GVuJXRsR480kqhR A7lKGoZALkGERmAkFhmxmvOWIUuvb7ZKKSf7xRGTlTB6QJtg8U9gfkkKqxGJyg== 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 4jL6Xj2TDGzxmv for ; Thu, 05 Nov 2026 16:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31953 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 16:02:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 2734bbbcba3c - main - libthr: Create landing pad in thr_once in C++ exception List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2734bbbcba3cd6ff2bf4382fb6e85b884beb966e Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 16:02:56 +0000 Message-Id: <6aeca8b0.31953.3734f054@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=2734bbbcba3cd6ff2bf4382fb6e85b884beb966e commit 2734bbbcba3cd6ff2bf4382fb6e85b884beb966e Author: ShengYi Hung AuthorDate: 2026-11-05 00:03:01 +0000 Commit: ShengYi Hung CommitDate: 2026-11-05 16:01:55 +0000 libthr: Create landing pad in thr_once in C++ exception In _thr_once, if init_routine fails with exception, the stack allocate __cup will become invalid when unwinder walk back and free the stack of thr_once. This cause cleanup linked list be dangling. In here, we give the cleanup function a landing pad so that we td can correctly point to previous cleanup function. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D61212 --- lib/libthr/thread/thr_private.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 3cc0fe61de00..9ea56b5b8a35 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -249,7 +249,9 @@ struct pthread_cleanup { }; #define THR_CLEANUP_PUSH(td, func, arg) { \ - struct pthread_cleanup __cup; \ + struct pthread_cleanup __cup \ + __attribute__((__cleanup__( \ + _thr_cleanup_unwind))); \ \ __cup.routine = func; \ __cup.routine_arg = arg; \ @@ -949,6 +951,18 @@ _thr_check_init(void) _libpthread_init(NULL); } +static inline void +_thr_cleanup_unwind(struct pthread_cleanup *cup) +{ + struct pthread *curthread; + + curthread = _get_curthread(); + if (curthread->cleanup == cup) { + curthread->cleanup = cup->prev; + cup->routine(cup->routine_arg); + } +} + struct wake_addr *_thr_alloc_wake_addr(void); void _thr_release_wake_addr(struct wake_addr *); int _thr_sleep(struct pthread *, int, const struct timespec *);