From nobody Tue Nov 17 17:02:50 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 4jTWJC4C9sz71QbG for ; Tue, 17 Nov 2026 17:02:51 +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 4jTWJB65jFz3RKs for ; Tue, 17 Nov 2026 17:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934970; 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=+0QuF5WVbDL8Isi8l8Iyq2HJbVbzD1nrGCBV/PF47Vw=; b=bBWtL6yv+jmb9pIDhTHTDg/1t8XVgGwN7588CnJTsCRxEQim9kP6JSxt8Reo6dWaKbC7NA ms9MNPrHQKiLjvJnv1GL0kEo1aByghq9gZno4aAU/50wujoW8ee9X15uEgGfEexeg2hbXr 1zWfU6pjFsGC+Su3ozZ4fUyjwJpESF9JUVmtyC7XqBcFJ2GY0qRokkpOKWzmEP+7GZI13F 5TPUiyApGBhmBbBcpt+3AyZqJpyxpLFmbH+uulhaRJVmXWGHtQLowVfqO1zNjMZnOhGTN0 tkVkGu6UneIjtF3b6K0RiRvDcBNh0dA038hZ3N57DymRhCU8FZjny/WUiJz7+w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934970; b=dZY0Y2MhUz2bdY0ZmT/oz6nJv+LuorkZ5to81dOdTPRSLZ1PSHK9XlTZ5+ANukePTMlsXp Ni85EP4FKIzaT5Sfguwzg1XlIwDHzg6sx4b6yaRPF8sckrxSnmUdWh+dZNgB+SWbNJFzXI +h+Yi8yGpCudos8Tx3ThcHu/XALUyhJaVoDMLAK/xU2S00PkhFWZO9bZ2FsFZ+9cuu7I5X Td6biH2iORDnaI+8lOGDdyOCtOJPpg2KkHnR11sn3uGgH+fO19izKFv20wNG6UA39D4Nsc /v4YA4uEqVBdLGBN/pxL3PZuQjeRrISwvgCykaX5M9nyQhxrMlkEvcAs3c4cWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934970; 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=+0QuF5WVbDL8Isi8l8Iyq2HJbVbzD1nrGCBV/PF47Vw=; b=JMiAx+9rGEmEuQw6bXcLpG63dXOLhLBo7Qhxow71mEwYOHwepBVHHBCGThz0Jg/MnxBhdx ZKsxZ5Wu/r3Psl8nY3GbEuLeVaQQ5HaCdJPTdgHngzPUX2h0XnNLin7PTKbrzi3i4ZP7bB klZuZAPGQyE6QBoc8m6ItUKHGSnXPYnLq2x8RgjJMbpadoj/j+A0kb9DQhefkch64TWwl4 yh+NFQUMCaevfPhY+NzMeeiWCjiY8YWBaqFAqoxiDhAYxGCF1SNGzh63M1OlxoRg0wiCUE THdCEotUTL7GBj3FiiuqucBswGqWBUnLxjbnm9pcYUCEAwoOFaeqjv5Uh+DApw== 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 4jTWJB4tt3zrYP for ; Tue, 17 Nov 2026 17:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f088 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:02:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 65b1a6ca6095 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 65b1a6ca60950e44859171534838c16678b7ea0f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:02:50 +0000 Message-Id: <6afc88ba.1f088.31254e6e@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=65b1a6ca60950e44859171534838c16678b7ea0f commit 65b1a6ca60950e44859171534838c16678b7ea0f Author: Mark Johnston AuthorDate: 2026-11-12 19:16:53 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:24:10 +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"));