From nobody Tue Sep 29 15:56:19 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 4hvN842FTdz6tl6M for ; Tue, 29 Sep 2026 15:56:20 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvN8375QGz4Vdd for ; Tue, 29 Sep 2026 15:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697380; 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=pvwfrW9ERqqPLW4NzjxTlGqyeYo1qszEURhCnPVtGnA=; b=kFmY7OqSIx3TiPLfcpwMigxNysjIXt8Zmlj6kMqBW0RxbnaF26xwzfl2UzZzc4KFzeRWxe fRAd/YjyjHJkHNQYDo1+QYOESJQ9BC9a4gleeoAmWU8LFHHDlV1A85pRhIddadJ91LoNHM vVKb/hpWmURY3R8Bj2FcP4FLGilHTe/BB2HX5/2fF6moimaCUavcjtymHEZpL+UwlDsYzr 4/M9L/+siWwkYxd2TqGTjxX9dvPKPeZ7bUyt7GR9Jmy3xt96hMPayCZKoMv9fE6PojgmvY 9brvYM5AbwdxWzrv9UBKtdxkg65BggtkmCQeFR0XBHKagXJlLzYgjGh5gKV7NA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790697380; b=QRp0wT1lOmRgZuP/cYXfLHBvhj/MchRrX62Kcd/WbAQwdPS6ICSBJvpr79wvljjOsi5tIQ XBPCRBm3jRDN5wH9jxznghqNbYad50KjtgivsfdVvgw4HvEOaijdLtTeSzojf5BWxtquRL sAU3ahPYktSEB7pHW6+PxeNAwh534Lzl0Iprq3gH8+LPkCbzLNljTUGf9lXyYrxMQGHgwF hIuP22TWEetX5vUqevJl0lsZo4TgVJ59ilIJa9SILsW/aVXySbN7ed5ze8jFkl4xbRfuek /7GHJn43yS/hnQl8PjWJIdBb8zJPuF7MKZp60dOG+wAZVsrmAmUIZPCw+WbQwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697380; 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=pvwfrW9ERqqPLW4NzjxTlGqyeYo1qszEURhCnPVtGnA=; b=AS0HEYE9u0yLocOgiq2oMMDZUtSOfwB2RD2OjFggsKkjDiwlNDDjsWePq6zSnxoPYFCroP Ia9YrtjyuG/rS/TvwWJOJ3oAxN0OWeCg9Je6QVloKa++/Lz91da6SQSh8xr1O0yHX0g2vX Aw/MXDI3eTfMs/nZDp6pe/1GK2k6mEr9GrSoiC7LdZnNd1OAqUMuYlzGkVo64lnuYh3Btx vJdG+KlsNBBVhUMdH6s6LAzjriGqGuKjWGwwO4QPAWKNpLcNHL15LERJF5ef0MMXLJAgeH 4N/5tEpCaK1uK7VO76pGgVf3Zrkjo0Ly/NeOqF/Yof3Ereilm06ilDtUgbYPrg== 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 4hvN8368gDz1KTt for ; Tue, 29 Sep 2026 15:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 15:56:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5db05b5dedf3 - stable/15 - kqueue: Fix a potential OOB access in kqueue_fork_copy_knote() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: 5db05b5dedf38cc9e31f89a9f4df9abb5cb1b539 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 15:56:19 +0000 Message-Id: <6abbdfa3.262dd.7a4c9362@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5db05b5dedf38cc9e31f89a9f4df9abb5cb1b539 commit 5db05b5dedf38cc9e31f89a9f4df9abb5cb1b539 Author: Mark Johnston AuthorDate: 2026-09-28 13:42:54 +0000 Commit: Mark Johnston CommitDate: 2026-09-29 15:56:01 +0000 kqueue: Fix a potential OOB access in kqueue_fork_copy_knote() Here, fdp points to the new fdtable, copied from that of the parent process. There is a window after the fdtable is copied, and before kqueue_fork_copy_knote() runs, where a different thread in the parent could have grown the parent's fdtable and registered a knote with ident larger than the size of the child's fdtable. This race can lead to an out-of-bounds read. Add a bounds check for this case; skip the knote if it is referencing a non-existent file. Approved by: so Security: FreeBSD-SA-26:65.kqueue Security: CVE-2026-58100 Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59916 --- sys/kern/kern_event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 32e2e6e69d7e..5bfa6f8a800e 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3108,7 +3108,8 @@ kqueue_fork_copy_knote(struct kqueue *kq, struct kqueue *kq1, struct knote *kn, } fop = kn->kn_fop; if (fop->f_copy == NULL || (fop->f_isfd && - fdp->fd_files->fdt_ofiles[kn->kn_kevent.ident].fde_file == NULL)) + ((unsigned int)fdp->fd_files->fdt_nfiles <= kn->kn_kevent.ident || + fdp->fd_files->fdt_ofiles[kn->kn_kevent.ident].fde_file == NULL))) return; error = kqueue_expand(kq1, fop, kn->kn_kevent.ident, M_WAITOK); if (error != 0)