From nobody Wed Apr 8 22:42:39 2026 X-Original-To: dev-commits-ports-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 4frdPC6Gz8z6YvGW for ; Wed, 08 Apr 2026 22:42:39 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frdPC3k8kz3pB1 for ; Wed, 08 Apr 2026 22:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775688159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k1LCAY66D4V0CtobaQvlsZiz5WZKO3haMhCeJwsX9tc=; b=DW9nSAsK/crYHwMxpv5MDgy3O+1IZU5i+ESzYGdm5esD4AY7N36LdzKpgM2MOMI+dAT7dl Rr5RQgwDYqM0n/JDoaB4OLE94ZPq276HcjOgcjoiWk/98PfSjzzCyEm4YMcrqO5m+zn5Hd b5qynCli3BM4jC7QVBQ4xTPN5T1hbMXf5ySk4F+AapKqXxtZp99Oyxmwz9TC8slFhQKOny 7ZrCQi6nFWss/0FE686TrJ7ngewT2ZMtGDDyCnJdfmwsVFcdl87z6hNz7+7VoZiDMMOXXa byZHGaBc91k9//jIfdWX2Q3wO/+d3aCTghygwOeaYFuoNi4LWX5u2S6Pz/rL9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775688159; a=rsa-sha256; cv=none; b=wETYHP+dJDzFoY1Sb0Xr/GxkSnOXN1k0zWTMczjA4Rn6IDE83mNVWjCpDxx/0lXflrsqVR ijtmEu44E/ywynoNzeot9uCRL5ciXEgGlUIQJz7L6hIVHHUdj3Mm/m3fFjeTz2LOKuoLEP tUvXyaZHv/82P2HaCIV/qBih53XiWKgE8Bh3Y6uitAvLdShEYLVv/GJm40aG3zvNH2Y9J8 sBVjm7qSDT5ap/Q04ivLZnVKrtQ1BZ3g85cA0JdQAdjO5yqpysXfhF2mXb5JNGtf4TnHGO RxHNGymlXnnyQZkqgHFi+sAvixVYUSJi7tNAXG9YChnGodFQUvp8TcT4MOT2cw== 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=1775688159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k1LCAY66D4V0CtobaQvlsZiz5WZKO3haMhCeJwsX9tc=; b=j7rSFYx7sJ3C/dNpwxSRtde1cVHfRS0br39CC+QIKuwklJJKlCn2lw8pHB89G9d7pdnq0n 37r8QNFzAr8bL39XVuXxhIDzhze/jY90bztuzvQeDcsQEVxLdn0BS3Vc62QQHaeqFZpVWe YeRbnRaC4zFZQahKBrO6uH4SPRg9HUHBIyQmZP29K/iK6x3tmbUiLCK2YEdMXbj4OdfQTt Z7DMroYlJon557gg7Z60WxoSMq3hY/fE/Z27Qsg/VbNNaGCUdR9BpIh+zuFa5kqP4H5l7h Ajz8WPOh5LVIFqHcuyJ13cbsjoNgl9McGnSCL6x8EATsiVLIuujmLFF/kX01zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frdPC3J45zmsX for ; Wed, 08 Apr 2026 22:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e1a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 22:42:39 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Generic Rikka From: Vladimir Druzenko Subject: git: 1ef58f980f42 - main - net/ucx: Harden async thread state handling List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ef58f980f422e30804818df7dadd3c1da3dace0 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 22:42:39 +0000 Message-Id: <69d6d9df.22e1a.36615c68@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ef58f980f422e30804818df7dadd3c1da3dace0 commit 1ef58f980f422e30804818df7dadd3c1da3dace0 Author: Generic Rikka AuthorDate: 2026-04-08 22:13:37 +0000 Commit: Vladimir Druzenko CommitDate: 2026-04-08 22:42:18 +0000 net/ucx: Harden async thread state handling Avoid dereferencing the global async thread context when startup or teardown did not complete successfully by returning UCS_ERR_NO_ELEM for operations that require an active thread and by only publishing thread_p on successful start. This prevents invalid access paths during async thread error handling. PR: 293867 Sponsored by: UNIS Labs MFH: 2026Q2 --- net/ucx/files/patch-src_ucs_async_thread.c | 61 ++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/net/ucx/files/patch-src_ucs_async_thread.c b/net/ucx/files/patch-src_ucs_async_thread.c new file mode 100644 index 000000000000..c02cfcedcd32 --- /dev/null +++ b/net/ucx/files/patch-src_ucs_async_thread.c @@ -0,0 +1,61 @@ +--- src/ucs/async/thread.c.orig 2026-02-04 09:52:46 UTC ++++ src/ucs/async/thread.c +@@ -224,14 +224,23 @@ out_unlock: + err: + --ucs_async_thread_global_context.use_count; + out_unlock: +- ucs_assert_always(ucs_async_thread_global_context.thread != NULL); +- *thread_p = ucs_async_thread_global_context.thread; ++ if (status == UCS_OK) { ++ ucs_assert_always(ucs_async_thread_global_context.thread != NULL); ++ *thread_p = ucs_async_thread_global_context.thread; ++ } else { ++ *thread_p = NULL; ++ } ++ + pthread_mutex_unlock(&ucs_async_thread_global_context.lock); + return status; + } + + static int ucs_async_thread_is_from_async() + { ++ if (ucs_async_thread_global_context.thread == NULL) { ++ return 0; ++ } ++ + return pthread_self() == ucs_async_thread_global_context.thread->thread_id; + } + +@@ -346,6 +355,10 @@ static ucs_status_t ucs_async_thread_remove_event_fd(u + ucs_async_thread_t *thread = ucs_async_thread_global_context.thread; + ucs_status_t status; + ++ if (thread == NULL) { ++ return UCS_ERR_NO_ELEM; ++ } ++ + status = ucs_event_set_del(thread->event_set, event_fd); + if (status != UCS_OK) { + return status; +@@ -359,6 +372,9 @@ ucs_async_thread_modify_event_fd(ucs_async_context_t * + ucs_async_thread_modify_event_fd(ucs_async_context_t *async, int event_fd, + ucs_event_set_types_t events) + { ++ if (ucs_async_thread_global_context.thread == NULL) { ++ return UCS_ERR_NO_ELEM; ++ } + /* Store file descriptor into void * storage without memory allocation. */ + return ucs_event_set_mod(ucs_async_thread_global_context.thread->event_set, + event_fd, events, (void *)(uintptr_t)event_fd); +@@ -421,6 +437,11 @@ static ucs_status_t ucs_async_thread_remove_timer(ucs_ + int timer_id) + { + ucs_async_thread_t *thread = ucs_async_thread_global_context.thread; ++ ++ if (thread == NULL) { ++ return UCS_ERR_NO_ELEM; ++ } ++ + ucs_timerq_remove(&thread->timerq, timer_id); + ucs_async_pipe_push(&thread->wakeup); + ucs_async_thread_stop();