From nobody Mon Aug 3 11:38:37 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 4hDF7140kCz6nC3q for ; Mon, 03 Aug 2026 11:38:37 +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 4hDF711sQBz3RgN for ; Mon, 03 Aug 2026 11:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785757117; 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=sAW/W6B7VeQh7U3oN/k2ABVoEboQ60dJYXzNe7Wgmnk=; b=TQAhnB5MK03aDbSRySCTr7wcGBxPjepmlYOaMgsb9M3TYOpYMM2ehfiHYU+wZGFjMdx4s7 Bu9doVyVn/DQaX59vXsitzoxglCZfLcdT55BYkKIwVFkoGjn/+KoK5wUE6zAYqLwkKXoBO RTX6g24WdB3fv1uMEVmSOAJMgh0j2nEFFdJwuSYEfNJhpaZnkFJNK+oB3l6+8K3MEKvmXy Je2s80q7sEGK512FzXqnbl1/5yUd7wSK1mpElobSL6wKlH/uMDaIlHbLC//xqk+316jzcb b2gNyJ33XR9Om5CSU+ilK06SvTB9DGyAvJta3z+3vVblbf6/2SbiPJyecCG6Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785757117; a=rsa-sha256; cv=none; b=EVOj369lKmST8kpBDNbGjnedR8+RuJdWTEdYBud5scxUUuyT4Kv9/FED6mCsF8cJDpDi8a Kq1x+uIyM2aJXDZ2uueLT++ge6IC5ZZmhtnhntzMK9uxblsqdVqkv7o0BvVJW+afUdloyF QDanhe5E0dTCpzMVFkCgUWvz/b8QqUn5FvyzzQhHFxIhW0Ih/ZYmqeoDYis/q3gBV6+9GP P1uCDykDhh9ayvfvAdi57z3p4ENiGWGEeatAsXXWgBaffKOI7gzsLfPHXf0lAZNvscJlp8 FcmWtlIHfFIzPZ58dcdeju26YRLqKVxlczY+21lV7oHr8g2baV8bSlxaM98IrA== 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=1785757117; 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=sAW/W6B7VeQh7U3oN/k2ABVoEboQ60dJYXzNe7Wgmnk=; b=VM49aj5cBqlqDDS48q4h5nhTO3JhcUnnBHyxSiuok/DWnFbuARCc6dsura5IU2vQQtniRw fiQOyneAXpOy2/gNgVqRFukzX1RVW9kjKjlAd08+JQic7XNhmiBbjClxixiLvLIt+7BNUl wVGCBFPal69U4u33xy8dAvHC0/b25qzKrxQjLYqCAPikM6a1H4qAKGQYklifZ6push2vNq +Mz7Kq5R9MOSBiZvidXFnLnGYqAViO1qeYN9zWz0aA+/EDcvIzlmO5C6EvFnM4Bdwk7urW sh0eAtH6Y7M5pL+tF9+6Ji/TS3YSG6yZFRPlBjPcRq3ZpbL5apYFCz1X2Q7tXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDF710Yb2zymW for ; Mon, 03 Aug 2026 11:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bcbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 11:38:37 +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: eeba99aff03b - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: eeba99aff03b49ade60189fb0567eefb899a8454 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 11:38:37 +0000 Message-Id: <6a707dbd.1bcbc.6fb0b795@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eeba99aff03b49ade60189fb0567eefb899a8454 commit eeba99aff03b49ade60189fb0567eefb899a8454 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-23 06:06:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-08-03 11:32:11 +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 706f0e6d658e..8e2dd0eb3492 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 9360ec147f8a..a06d29b91ba8 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -470,8 +470,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) {