From nobody Thu Jul 23 06:06:40 2026 X-Original-To: dev-commits-src-main@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 4h5LH43KDzz6mQK1 for ; Thu, 23 Jul 2026 06:06:40 +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 4h5LH42pGFz485w for ; Thu, 23 Jul 2026 06:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784786800; 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=E9IzCtIQlD7IQstgfhWUYoZ3lASVuL0H3iXDM0vG5VM=; b=xPX8y+vAQDe9api/pfuOvkVPLQPG41n69fcvzhvpC+TN35x6yLl2almmQDWd/+BGsytIKa sXPrHUyu6pf+pQm+Bai5zLKHEwAKniZwe3ce0prTvgUigNORYbKz/47wXYQsr0+nB1WftW 3DCYzlxA/o/N/8pwsLEZAUrHF4G9Z9sgwgMSCJtPjWa14sOC3ZBzuRSIVXepEK8VSUWgSp ijiFPqudLiXLaxdYrh7xeUFoHQyb2v3ndR+uHHaeL1zrtm+SMAU6u61AXBtxVYA/iZp4qO 3sF5300FKE9O7qTahPUF0cy9Ikj4krlv73Ahbx+URTTWKlL5xQZv+BsEKEtIFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784786800; a=rsa-sha256; cv=none; b=mqG9dVnwludaau7asKfO/WzBPTErhcYeL5VD7vBrGBivpDFu5+iI0U2Z1zsvMXq6Bjw/It jL9YRzGPGY3m2VQRW4sERb9EYdTI1yVDbikqQRQoLBncEkcleVJXrIOW4lQ50KZhR7mcRk OfwW1eIEgUGOtDy+4DbVNtWeuRZVBxCs96hgXRPN+wQi6BCG2TYmUhG9CPc+d/TsyfRzmS 5V9C15Qdz+qCO8DQ955ur3XYIlaAfy3yvyWWYtWM0/CaNUyTDnuyDOb6ThiSHpnixSk3ON 73avIEkS5FxiXdRKHZRcYwL8EUSOf6EQb7vD1ITw8YqRmFlYQZmQZ+roo47CPA== 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=1784786800; 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=E9IzCtIQlD7IQstgfhWUYoZ3lASVuL0H3iXDM0vG5VM=; b=STr4egpEbTPoUm86ujJru0HnatMQYX7xSL2rcoh9EzR6xqX3CI2glme66Znke43jp3UU23 EPlwzCKSXv1PfY9szxnYTFJL4V5dH+VzBm86PzB9xvirPzaH0ILE2nMOZ3YeUkrVJY7LTL 1NNmElQXiLwICUTdLF9BmMmte1fdOlldw1lUyuLdiU2DdTBpRS+U6lgGMUiuilEA5Y3xsU pDjFMYejvkV8F0ccyAimtmnfQffldj4OWrTj53XoteZLHEQ+2zdMtDTAXImyh1+tZlWPeq hHF8ZdDY9d3tHM3LBuJGag+wHyvYPPTHeq86seAp9NDr9Zvb/hxeP04I8oR0ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5LH41JmQzsd4 for ; Thu, 23 Jul 2026 06:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a258 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 06:06:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4627fe9e5afc - main - kqueue: Fix delivery of unwanted events List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4627fe9e5afc0dce4469f5964f5d4b0e49a24274 Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 06:06:40 +0000 Message-Id: <6a61af70.1a258.5795e3a2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4627fe9e5afc0dce4469f5964f5d4b0e49a24274 commit 4627fe9e5afc0dce4469f5964f5d4b0e49a24274 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-23 06:06:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-23 06:06:32 +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 --- 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 fa7f8bf7cdb7..e19415c8d443 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -529,11 +529,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 94c2df4b1e69..7fc63256bc05 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -518,8 +518,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) != 0) {