From nobody Tue Nov 17 17:06:05 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 4jTWMy1pjQz71RrD for ; Tue, 17 Nov 2026 17:06:06 +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 4jTWMx6Bbfz4JLT for ; Tue, 17 Nov 2026 17:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935165; 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=ToZVl02b8c4eLxxuA2yqL5aw4kt2FKJdsRONm8ukMpk=; b=oYiNQ7r9LLxt4FBP+i33kr7nnQTTRLEPFkbOXXHkmTwFf6t5jkDL8IsZ0gM/oPdxfuv/nU ZMXMKppcqSrwPZ0onnOTmcYTfEJxFuhD2v7osLkB0Vdp7cwEeJ3gpGGhiWUo9sJQ8zTJnc qqqMpuydM0x1ZngljD6XU4D/p96HDaMILk+aCIxtLtcqfsuI0khJmRLZjPmUdPf2HL2XN/ pQelvdzt7oMUQb75dbFGLHM2yyOEy3JPOawp6rhUek3DvrCwjrlBxwuqMD6RDnZAwMJuk9 wDPjstEu1IriuBptFpnSsEMRLjTq8RbIhsLO5RxVb+RxwdkKj438QDefaHdqKg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935165; b=oNn2dKLWQo5hdU+/ktLr6ksCe9oA8VXmoVcXRolbbEm+MEbbESAgl0khdqo8HkYG+q8Bq1 i/HwkKD8iiVASuxhuyt9bGJRG3c+3f+Ct14btrLbp/e8CDP/SWwaXHQ1Fl3Ed8p+QFqvAW yXyDech7tX3aRGqpJmJrO96+OBsz1IvCZ/2SA3IaLnwDoCtNsKguCPL8T5h515h7d5dT7J W5c/cEQttADCYFoynyfQGVhefV0h1/K/z/UL2FbXofNThxlhX1WsGcyu2IPtg5eZ4+CqUe GzXJQ+5reQYu5TfWEIobhTd4mMMvkj8kCpUTlJ0iva2x0y1R3jnqRTzySJUvTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935165; 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=ToZVl02b8c4eLxxuA2yqL5aw4kt2FKJdsRONm8ukMpk=; b=JOqAB/K8jHFOAIGSnujtgbytqrRRxp1LQZDHtqoWyVPV/Cm2F4xCtUSZpuPJX0l0Y+NW4Q fuFTU6N9x2/zQLmiXShAfreztH5bwyGqWlHMgAID9V+MACApbvi6uhs08R6pJbHZpTmOEl TjEIZqsRWEDb93zM72cfAHH+Gdx87AWUNcdB9D75weGj0XMsKsXBh2Vv96Om8vWMEiYP4s Lj4RafN6fdsLp2SGNDlPgUQFRwRlug9gvj4JERk/IvuOZ+SEOocCM4k8CLMYQDKrFgxDAZ 39996iAkkBT+kqgIIPyOa8XZv6Y5N7y/j8uaG53iPb34hfxCLqwZ1BLziKDyBg== 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 4jTWMx5rqVzrSh for ; Tue, 17 Nov 2026 17:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f83c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:06:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ac7d692a4455 - stable/15 - kqueue: Fix a race between kqueue_fork_copy_list() and kqueue_expand() 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/15 X-Git-Reftype: branch X-Git-Commit: ac7d692a44553d703005e4ab6fb66cb34fcc13c2 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:06:05 +0000 Message-Id: <6afc897d.1f83c.790f525b@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ac7d692a44553d703005e4ab6fb66cb34fcc13c2 commit ac7d692a44553d703005e4ab6fb66cb34fcc13c2 Author: Mark Johnston AuthorDate: 2026-11-16 13:46:51 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:23 +0000 kqueue: Fix a race between kqueue_fork_copy_list() and kqueue_expand() While kqueue_fork_copy_list() is iterating over the knote lists, the backing array may change while the kqueue lock is dropped. Since each list is a singly-linked list, kqueue_fork_copy_list() must start iterating from the list head in order to remove the marker, but that list head pointer is invalid after kqueue_expand() runs. Add a bit of indirection to re-compute the correct list head each time the kqueue lock is dropped. Avoid changing the layout of struct knote since I want to backport this to releng branches. Approved by: so Security: FreeBSD-SA-26:85.kqueue Security: CVE-2026-127750 Reported by: Dennys Kaluzny Pereira Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D61608 --- sys/kern/kern_event.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 853b65ea5f71..dd1fefe5c5be 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3149,15 +3149,26 @@ kqueue_fork_copy_knote(struct kqueue *kq, struct kqueue *kq1, struct knote *kn, KQ_UNLOCK(kq1); } +enum klist_which { + KLIST_FD, + KLIST_HASH, +}; + +static struct klist * +kqueue_list(struct kqueue *kq, enum klist_which which, int i) +{ + return (which == KLIST_FD ? &kq->kq_knlist[i] : &kq->kq_knhash[i]); +} + static void -kqueue_fork_copy_list(struct klist *knlist, struct knote *marker, +kqueue_fork_copy_list(enum klist_which which, int i, struct knote *marker, struct kqueue *kq, struct kqueue *kq1, struct proc *p1, struct filedesc *fdp) { struct knote *kn; KQ_OWNED(kq); - kn = SLIST_FIRST(knlist); + kn = SLIST_FIRST(kqueue_list(kq, which, i)); while (kn != NULL) { MPASS(kn->kn_kq == kq); if ((kn->kn_status & (KN_DETACHED | KN_MARKER)) != 0 || @@ -3173,7 +3184,7 @@ kqueue_fork_copy_list(struct klist *knlist, struct knote *marker, kn_leave_flux(kn); kn = SLIST_NEXT(marker, kn_link); /* XXXKIB switch kn_link to LIST? */ - SLIST_REMOVE(knlist, marker, knote, kn_link); + SLIST_REMOVE(kqueue_list(kq, which, i), marker, knote, kn_link); } } @@ -3197,13 +3208,12 @@ kqueue_fork_copy(struct filedesc *fdp, struct file *fp, struct file *fp1, KQ_LOCK(kq); for (i = 0; i < kq->kq_knlistsize; i++) { - kqueue_fork_copy_list(&kq->kq_knlist[i], &marker, kq, kq1, - p1, fdp); + kqueue_fork_copy_list(KLIST_FD, i, &marker, kq, kq1, p1, fdp); } if (kq->kq_knhashmask != 0) { for (i = 0; i <= kq->kq_knhashmask; i++) { - kqueue_fork_copy_list(&kq->kq_knhash[i], &marker, kq, - kq1, p1, fdp); + kqueue_fork_copy_list(KLIST_HASH, i, &marker, kq, kq1, + p1, fdp); } } kqueue_release(kq, 1);