From nobody Tue Nov 17 17:05:13 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 4jTWLx5prFz71RjV for ; Tue, 17 Nov 2026 17:05:13 +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 4jTWLx2Zwxz4H1C for ; Tue, 17 Nov 2026 17:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935113; 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=bDertcRcQGyVnbFLLamLI20P1zclFMWzi8QxZdAhj34=; b=SECyQjz+5AcruBrg0jZmFnYyTL8eZxTT4kVcDrkxf2OcvQFLNI+NsRQXMEn/PXIfxnKBBO 0k/T1W5+ZwecY81WITzCKJbjWlhHSus0Ivh3TYI9fXw2sYijf7uzBZ/ABS3b2uxg5tpr4A 62BZetVljqhTZco4KRPIXaHlMpryE8Jser7yRCL8njzz3Jrk2YCuAn7ZFbMqJ4DZR4naw1 C5VX+fuhR1nryuoaSPAUf2+/zOUkDwL5/ZI73sdOr7nYbo8eEt9AZtT8SVKEfdCRJJewpp a8viGbpyfct/okx0/lEV7176FBSkRYta6gDql9kMa7i0ds6g+nTw0G5yP2dvsQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935113; b=rBBjGOrekE33zKHM+/voXCZHLjAF9K7QohrI3Mt2L/NAnZ2QmwnkT9AUcdOzG935lNGRbL 0h9kq2M9hA7zcJ5UvuwgUFlAlMqWqebNfQZcPs+Py6k5GPqi1mFe5zlpblvILjrsR/Djrr k35wNtDaBULzK/jNMF4lfKzDiNbTJjU8e2dQNrrAelt79xjM2gAN0pW+2/yLee9gdvLLVx IAWvK7nfHxq8lDRZ/kOWhipbWrY7N1rs54dh5Z0qJnVeVxVfeAZyGWM4vj5b0hhqj/dWW4 /I1sDyl5H3+DvnHRRaUH7VJJL9FuSUWn3dT4JuxU4sBiZUaLRrE/m7NQ5M7GjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935113; 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=bDertcRcQGyVnbFLLamLI20P1zclFMWzi8QxZdAhj34=; b=XgJsLemcRGcqFL4+c3+/92fUTZSpDsx4wpm5AIgxOxTVWIPz0XBKI9B2K8KVj7Bf8Yn1MC FHj38cXI/71os+pXwIJ636BS/WMKbAMGX/9V5uhAKoNuAeBIjCOt+CBzKNIkyNMEbE7OQ1 qZCRjsChgnDYnekMf2eZ3V8IBC6Tq1fOmt+jsg2ouyIE7XBQNtLgb7O8g1e5aLSs2PbZnd nqbYbRL+3Fp8GtuHyMrIsl8Haiil/nJVJ5mgp5oaePXSODiVV5HFzbLsOBoYvIDVInuNt7 u+VA7BdJH+H21ZW5H+e8yKrtNpJEl+kgQA12ZGgGU5pxSeZlMVnd1DyZhHQDvQ== 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 4jTWLx0FhKzrjc for ; Tue, 17 Nov 2026 17:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e0d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:05:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6afa595f1f16 - releng/14.5 - kqueue: Fix a race when detaching a timer knote List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: 6afa595f1f1666c3cd39f12cd4271f358549062f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:05:13 +0000 Message-Id: <6afc8949.1e0d1.43cae48e@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6afa595f1f1666c3cd39f12cd4271f358549062f commit 6afa595f1f1666c3cd39f12cd4271f358549062f Author: Mark Johnston AuthorDate: 2026-11-12 19:16:53 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:17:12 +0000 kqueue: Fix a race when detaching a timer knote We currently maintain a per-process list of stopped timer knotes, used when the owning process receives SIGSTOP. Upon receiving SIGCONT, queued timers are re-armed. When detaching a timer knote, we drain the callout and remove it from the queue, then check to see if the callout was re-armed by SIGCONT; if so, then we loop. However, the callout timer may fire before this check, and softclock_call_cc() clears the pending bit without the associated callout lock held, in which case filt_timerdetach() fails to observe that the callout is still running and doesn't drain. The callout handler then races with a free of the knote, and the resulting memory corruption can be exploited to obtain root privileges. Fix the problem by using an explicit flag that prevents re-arming a timer whose knote is in the process of being detached. Approved by: so Security: FreeBSD-SA-26:85.kqueue Security: CVE-2026-101320 Reported by: OpenAI Security Research Team Fixes: 2fd1ffefaa4d ("Stop arming kqueue timers on knote owner suspend or terminate") Sponsored by: The FreeBSD Foundation Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D61359 --- sys/kern/kern_event.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index a735dfaa97df..69fdfa121c50 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -700,7 +700,8 @@ struct kq_timer_cb_data { sbintime_t to; /* precalculated timer period, 0 for abs */ }; -#define KQ_TIMER_CB_ENQUEUED 0x01 +#define KQ_TIMER_CB_ENQUEUED 0x01 /* in queue of stopped timers */ +#define KQ_TIMER_CB_DETACHING 0x02 /* detach started, don't requeue */ static void kqtimer_sched_callout(struct kq_timer_cb_data *kc) @@ -768,7 +769,8 @@ filt_timerexpire_l(struct knote *kn, bool proc_locked) if (!proc_locked) PROC_LOCK(p); if (P_SHOULDSTOP(p) || P_KILLED(p)) { - if ((kc->flags & KQ_TIMER_CB_ENQUEUED) == 0) { + if ((kc->flags & (KQ_TIMER_CB_ENQUEUED | + KQ_TIMER_CB_DETACHING)) == 0) { /* * Insert into head so that * kqtimer_proc_continue() does not @@ -881,24 +883,16 @@ filt_timerdetach(struct knote *kn) { struct kq_timer_cb_data *kc; unsigned int old __unused; - bool pending; kc = kn->kn_ptr.p_v; - do { - callout_drain(&kc->c); - - /* - * kqtimer_proc_continue() might have rescheduled this callout. - * Double-check, using the process mutex as an interlock. - */ - PROC_LOCK(kc->p); - if ((kc->flags & KQ_TIMER_CB_ENQUEUED) != 0) { - kc->flags &= ~KQ_TIMER_CB_ENQUEUED; - TAILQ_REMOVE(&kc->p->p_kqtim_stop, kc, link); - } - pending = callout_pending(&kc->c); - PROC_UNLOCK(kc->p); - } while (pending); + PROC_LOCK(kc->p); + kc->flags |= KQ_TIMER_CB_DETACHING; + if ((kc->flags & KQ_TIMER_CB_ENQUEUED) != 0) { + kc->flags &= ~KQ_TIMER_CB_ENQUEUED; + TAILQ_REMOVE(&kc->p->p_kqtim_stop, kc, link); + } + PROC_UNLOCK(kc->p); + callout_drain(&kc->c); free(kc, M_KQUEUE); old = atomic_fetchadd_int(&kq_ncallouts, -1); KASSERT(old > 0, ("Number of callouts cannot become negative"));