From nobody Mon Aug 3 11:38:42 2026 X-Original-To: dev-commits-src-branches@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 4hDF765c0Qz6nCHJ for ; Mon, 03 Aug 2026 11:38:42 +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 4hDF763bk3z3RkM for ; Mon, 03 Aug 2026 11:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785757122; 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=OrqXxTnD00floaJtSZ1zg6JV80iJJBR4qG7agh4bwN4=; b=VMbVVfxAXVx6TeEGVStLLdT5szRhIs53WmddsVr0Ik5eQ0xEbdLWzwzblsMjxtImjlFI1o nw2O314ruEVjwnrj1HxtDsAf9txgBYYwusPcXf/pTxcdHXPJRMqkmUpoUVTHmllYfaXeOE vSDTf7PxxmgW8PjToYGyoHKnZmr/8UuPehrAMoGy/b08/TJNwsWyjedqgKcci2gkRGtRH+ G5apqRUgRVoeeFX4J8zG/wT7m71SVguF9kPD93g3tqZ+vq13yd+kA3bGljqOUnbfNscRYw 0onQLJpaogACBzJ6pxZqZFEdARehFcaH+ShF5NgEMYwxIaAwF/zxQnZvVdjiIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785757122; a=rsa-sha256; cv=none; b=doCoB9R4lWE8+fA4BlZrA8YO7LcmJq/VgrwFN0SL/lGIpm2h2kRkt0As7fiE5hvptjJQAZ 1/gX//ScR29XOep11ewEZgpAw6Dmcf+2O4Bbk/lRecjfgFdRmBM2XU0cz8CM+owtqBGHSW 83fKIlczmXjGxrOPsO0q1lgwBQOr/EWNs/ul9xyoF/e8V6NksC5lz91+sfJFhepncBDmdt 02IVY/aqdu/tgNMroIwReAN5a21G9Iyd/VOzce0eEbPNnys/6AMtSvGG3RYgo4BJ+JXe9a gL8VBU+fv8kU2/ehhF3R5Dbkk0nbyPaYopMaIJQO1h9R4ligdt4I6XC1RvCkzg== 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=1785757122; 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=OrqXxTnD00floaJtSZ1zg6JV80iJJBR4qG7agh4bwN4=; b=S4aKF5uAO6jSXBuYQa27cglElyN8mC7wdLNIuUzCmPMKi5BZVIeNTQZnRBSRGxZSyvPPaJ g16c7eD4VVhj+J+8CEAdMLIxG9hRH1GoT/WC+G8FwxdIzqH3undQCUXDAVzacxAMNg+MJx 8Ptt6gQT6KD4Kcru3s7JrllpBz6s/sbAaDqBo+Hu5H0IoL+/CyXMVsuZKNuZ9CggBcu55B zcMHEc5YXd/B0BTFM1ieSweNS8Ah9GupwtzfpvUOnqG1C4tgrzG7cQW/qZzxQmoOyshj4s eSpKThgiSDptYChbNYB3hcUmH6at3tjETOjrQUZlKGA2DenEzpffOJTWGdCN/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDF762211zypq for ; Mon, 03 Aug 2026 11:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 11:38:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 70b3d322e5b0 - stable/14 - kqueue: Fix delivery of unwanted events List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70b3d322e5b028e9e098f5cea62164af7d9c6fa3 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 11:38:42 +0000 Message-Id: <6a707dc2.1be75.5d04f10c@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=70b3d322e5b028e9e098f5cea62164af7d9c6fa3 commit 70b3d322e5b028e9e098f5cea62164af7d9c6fa3 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-23 06:06:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-08-03 11:32:13 +0000 kqueue: Fix delivery of unwanted events In both procdesc_kqops_event() and filt_proc(), the event variable can have more than one bit set. This means that: * We cannot compare it directly with NOTE_EXIT; we must binary-and them instead. * We cannot binary-or it with the report mask; we must binary-and it with the request mask first. MFC after: 1 week Fixes: 2a5e58c59694 ("procdesc: add NOTE_PDSIGCHLD") Fixes: b328975b9d7c ("procdesc: report NOTE_PDSIGCHLD for traced and stopped process") Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D58395 (cherry picked from commit 4627fe9e5afc0dce4469f5964f5d4b0e49a24274) --- sys/kern/kern_event.c | 6 +++--- sys/kern/sys_procdesc.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index aaffbfce432c..e2f44aea27b4 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -505,11 +505,11 @@ filt_proc(struct knote *kn, long hint) event = (u_int)hint & NOTE_PCTRLMASK; /* If the user is interested in this event, record it. */ - if (kn->kn_sfflags & event) - kn->kn_fflags |= event; + if ((kn->kn_sfflags & event) != 0) + kn->kn_fflags |= kn->kn_sfflags & event; /* Process is gone, so flag the event as finished. */ - if (event == NOTE_EXIT) { + if ((event & NOTE_EXIT) != 0) { kn->kn_flags |= EV_EOF | EV_ONESHOT; kn->kn_ptr.p_proc = NULL; if (kn->kn_fflags & NOTE_EXIT) diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 515d0365ec61..f1aeb4066fa4 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -465,8 +465,8 @@ procdesc_kqops_event(struct knote *kn, long hint) } /* If the user is interested in this event, record it. */ - if (kn->kn_sfflags & event) - kn->kn_fflags |= event; + if ((kn->kn_sfflags & event) != 0) + kn->kn_fflags |= kn->kn_sfflags & event; /* Process is gone, so flag the event as finished. */ if (event == NOTE_EXIT) {