From nobody Tue Nov 17 17:08:21 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 4jTWQY3F7Yz71STm for ; Tue, 17 Nov 2026 17:08:21 +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 4jTWQY0YFvz4MnS for ; Tue, 17 Nov 2026 17:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935301; 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=8R9k6JI5PqHCdemElMiDNV0xBrhmA7qJkX2VjpdYQDc=; b=jAbevIKDYPRJ/sGOVP2K5n8NhL4E42Nf+rS2uh4d6cueVJhmsUbmNMhKlySM+mLG8ld64W CirX2FL0BF/1TaZzO+H+hQtH+xF1Gwrh8vpLKmtzu1FNkaYXvz4t+Ua03jiIBDDl4m1FHX DPriyAn94RQcsPhjfZwHgLgyhkW6O5mJXZuyt2wpTjrVENO3VYtoZBHafNp81eEB7Maxt9 XII55L1dyj5xZHvxOWtEwfELK0tiCih42JyKrrcVWTMasblvCBDmQPIlfvj++9+9yRC3s8 skWiuULZQvr5Gx9O5sgy2vRvLnyLtfRffkrdnuabXAcOueoe5IsVdS6limXWbQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935301; b=V5uQKwBRAdpJdnNoObkPiqd9m7y2dokr3yM347U+8pTsaaDzCr3woFog9ZjDlAwduc2rxR eq7qYq2vdeSD+P0onDAFyH+5EspXeBIafLNZHrq/xp7YMYh3yS8qZBcL8UUTKtJ6/1XvVh TOAYdLtIloPNy8zI+Xitj4aPCnEKEBYAQkzY47cJdH2R3W6Z60M6fcTC9KzNZT56pNMnWt Wmbs9bn5G4e8Ws1Ts+7z5CyvvgWRY2c7KSyi4+U+7pS85hNt78ZF0PQcxMVbv1pbUG87bJ RnEl2hYYMBG/s4u3kgcyYoJI88ohWW7pkxafuKgjm0+6ysU7klPhAA81oyERwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935301; 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=8R9k6JI5PqHCdemElMiDNV0xBrhmA7qJkX2VjpdYQDc=; b=hEv9FQMtELNVN4btn+9VisGar0a786fCo+S5jmpfVzPXBO2t1hySrAloJVO123MjmQxNak EKj+nV4Q4Xi8s4zzpEG7VRZ4sokzYQJc/ikj8SvaVwiFGp5YbU6FidP8WYtap6gLBf20fJ Gpw6v8KSoZVQQBVsR0k301lEB8itwgODJS6RzPGV3+AF1uJ8SDg+TaGoO8NJ/K40qhsmo2 s4nG40e8XYfFmntrHZcLiLUN4BtaKVuOjWGWHhzdzCWvUOCB9dRRxktq6fT5dMppd/ZMBs /ohlOyES3NqDl4Hc7Mwwg09DsF4c7STQYDHMAPU5/XPgDJh878tunh8B8e59UA== 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 4jTWQY0DPLzrkF for ; Tue, 17 Nov 2026 17:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0c7ff24b1eb2 - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 0c7ff24b1eb246f648caeec99ea5cd6de87b3f85 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:21 +0000 Message-Id: <6afc8a05.d85.9b2ffa9@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0c7ff24b1eb246f648caeec99ea5cd6de87b3f85 commit 0c7ff24b1eb246f648caeec99ea5cd6de87b3f85 Author: Mark Johnston AuthorDate: 2026-11-12 19:16:53 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:25:02 +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 | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 11348a443737..937a5c87cb5f 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -801,7 +801,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) @@ -869,7 +870,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 @@ -976,7 +978,8 @@ filt_timercopy(struct knote *kn, struct proc *p) kn->kn_ptr.p_v = kc = malloc(sizeof(*kc), M_KQUEUE, M_WAITOK); kc->kn = kn; kc->p = p; - kc->flags = kc_src->flags & ~KQ_TIMER_CB_ENQUEUED; + kc->flags = kc_src->flags & + ~(KQ_TIMER_CB_ENQUEUED | KQ_TIMER_CB_DETACHING); kc->next = kc_src->next; kc->to = kc_src->to; kc->cpuid = PCPU_GET(cpuid); @@ -1006,24 +1009,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"));