From nobody Thu Aug 6 15:01:38 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 4hG9Tv6vDxz6nBJm for ; Thu, 06 Aug 2026 15:01:39 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hG9Tv0qf3z3F2f for ; Thu, 06 Aug 2026 15:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028499; 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=FonwfqIVjlVtGrKYVtkaCJL34oY/etIZNGQhDiOcNrw=; b=lWonjw25BmX2f4dPFoPg82hXtWPfxCHkhcicuvA9z1ofqKchUfqD5XOL/4cq3BvpSPstNZ Wwk4znbVgmCEVv7zD7k0eFzydQNpGPxPToWu7oIUVKStErTOv1y9hZReeEtDIzcVu85/V8 Pp2EA6cvKgkDZCIicZOOE3YzDLQJ+j+FPpYP2L8sapCpAqb0Ucz3Fr5LG1wEek90GlWSOz hRy3Yfg+AFXpafBikw0O44RU/+ZsHhsgdvIH07H1OVhpHyJljUvIyNFDSQqW11KZWeuqgd WjWy9n9xkgAkmucveUjlRk77y76nHVpF8IbHxaGQ91udC5C/ZsjRktmBNJYGSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786028499; a=rsa-sha256; cv=none; b=FFEe2AWB84nw6dWWj+UJajeLhhmH7QNmXg2LAmvBD0krBulbMps9m7U9yJSn6+IYUjCTiv 8mtlddckv4o7vSwW7ambmFSjmyHW8FbxYLmkgISl7MnhoChWt94goKKg2zghf86s1NLPsY xL6GHqNlx78hiKt18V7WkrAXWTZjR/R5/6RqyXa/C/zssAEDeypCaqEK1cdrROGvmE0tfs qOAjitkmbkdg0zfIkRSgMHJ/6Y4fHJiDgmO1qFl863xi4jmZ5Nq46vSL3ChO9v3IqKH4fx VQyLbNJt0MVqPOl634VkPnnNbStV8wY86Gkc4mqyK/YVM4N5ysOlZFoGYNL9pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028499; 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=FonwfqIVjlVtGrKYVtkaCJL34oY/etIZNGQhDiOcNrw=; b=jwOxxryWA+kAyOQpAQ11jEdWH6Ah7bve9ES7guR3gAPSVnTm+DCALfPwBqNB7FoDOYCKm8 x9BxS//PXD8KmtxHEYnC3WKX4RzLqJ52ukn93bLQsg9l1aL6efFG+pnAGiWG3oNQUZKmpd wA7ZJjbf4nZNLpETegCVu2e2u6Gwa6PuNjuEnTBHPw/ZH0mhtIJBh4ehlFJf49G5VCbOZg A89fk0Wf14yw0tdC+9IPexB0GHnFOLl7izdOje60uA8mXiDzhmrbofsSij1m1MZOvdS0+/ 22756fxrqB6/p32iztZqS5MvG6i8NkSo7ywQnNMG0tTGWfXy0sZ/xR0UYB4C4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG9Tt6xCyz9Gy for ; Thu, 06 Aug 2026 15:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45daa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 15:01:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1ede9ecfe610 - stable/15 - kqueue: Associate marker knotes with a queue 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: 1ede9ecfe61017cc28ebeb4e65506ed0efa59408 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 15:01:38 +0000 Message-Id: <6a74a1d2.45daa.591b9bae@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1ede9ecfe61017cc28ebeb4e65506ed0efa59408 commit 1ede9ecfe61017cc28ebeb4e65506ed0efa59408 Author: Mark Johnston AuthorDate: 2026-07-29 12:43:55 +0000 Commit: Mark Johnston CommitDate: 2026-08-06 13:24:43 +0000 kqueue: Associate marker knotes with a queue Otherwise the assertion in KQ_FLUX_SLEEP_WMESG may fail. kqueue_fork_copy() already handles this. Fixes: 1f4b0ea4f3eb ("kqueue: Add a helper macro for sleeping on in-flux knotes") Reported by: syzkaller Reported by: kbowling Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58516 (cherry picked from commit 9a9349ea1da2d80e979fa87b430551d8f6dac7f4) --- sys/kern/kern_event.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 0a02642cccae..3990c2366ab4 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2160,6 +2160,7 @@ kqueue_scan(struct kqueue *kq, int maxevents, struct kevent_copyops *k_ops, asbt = 0; memset(&marker, 0, sizeof(marker)); marker.kn_status = KN_MARKER; + marker.kn_kq = kq; KQ_LOCK(kq); retry: