From nobody Mon Apr 13 14:43:28 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 4fvVX13D9xz6ZGL9 for ; Mon, 13 Apr 2026 14:43:29 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvVX02DvLz3vRg for ; Mon, 13 Apr 2026 14:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091408; 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=LQq/KmRfGrmBj01ik4M7XoSJ0/lq64RYK2Th2Z96p28=; b=YZR8+qN1O6ISq+f8wS2ugJqfuuQveOYHQrBJ9akZ43ygg/zujtCFfYBG7DLAU7xzjft7pg ZE+Y69HBPTgxNAHA25RVBiQco4FFN8QM4CNecpZZseLxKGCYlHpgK8ydTFA7WFtrAKZAtJ QylkQXAgwXPq1WVTWvPMf+zx9GpoA9KxgJAg+ZaZobjPrdJ96RbQc4hLCIpRf8lLN+qzqn XLRCGrqbyzsfNq6qGgmLv719xZeSINf+PlvO9CcjWUssHf3soCSZE7Jg2EYSQZFrl4Pl/t seJ2z5PmBWTXWBkAYx+G4LbVih8IUMzHcRNT1miMgs2uj1zqwQf8iuOvo71Lxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776091408; a=rsa-sha256; cv=none; b=H1g8RER6/ZaZnuSnVPEEHq+YcTNHnpjx9x0mi0YzVAH9bC11kq+Wq0J/VaUcVTlUibhA4O NLXWdG/9YIDdyyCjIFNXtkfU23mKUfMJW23pipX/SCX2TdAYVu95Tzmzpwif3slnYsQYjU 6O5NSiWrQoVEdGMF79w3XOY9HkUoP/diP16C9MatmNFc0E7G7D9ICycTU8qFMl0kAWe9sC QXNhy2CE60ixoMOtFip9UAxxLULr1K5LoC0Ktb3zIVik1RJ/MZzgkyXKyhbMU8Ix8v6SjX M5EWNA6BvzC+xQTjl/c5hXk2u2N1GntKYKXjWO1TDgHGKrijyiwKQk83pP16Rw== 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=1776091408; 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=LQq/KmRfGrmBj01ik4M7XoSJ0/lq64RYK2Th2Z96p28=; b=q4Xli2J7B/Ff0AncDxRIF2ncE0yIbz9T+cVQ6XDB2JR542ZEibi3PA59zzP8QB5D9+G+R+ OQ+dGgaie6r55Utxpl8grcNTXjdtVDpTzynohCDgTX8eg3EfIdHEoKWmT2LXVFOTCspxMH g6vNre9O9B8nUx42FTmvsaCdAp3At74vxmoppbDyeEQRFpoaN1WH2d7kP/Ciki4LQNWZBd yLbV8srH/PgGTr/9L77SZR2CURCYGg1NfcghzqNYPo8duyCkUsKfEzYJ0j5Ke2jXr263J5 k9Ha5g7QEX4Fz9dXjjKGne/9L8fAsXJ2Gv/uog/fWmgHI4e7ncTiterYK3Sq3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvVX01YSfz1759 for ; Mon, 13 Apr 2026 14:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a10c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:43:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 64c72d3020f5 - stable/14 - kqueue: don't leak file refs on failure to knote_attach() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 64c72d3020f5c0d07219745f658400ca26654d84 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:43:28 +0000 Message-Id: <69dd0110.1a10c.13b8c5d@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=64c72d3020f5c0d07219745f658400ca26654d84 commit 64c72d3020f5c0d07219745f658400ca26654d84 Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 14:43:17 +0000 kqueue: don't leak file refs on failure to knote_attach() We'll subsequently just knote_free() since the knote is barely constructed, but that bypasses any logic that might release references on owned files/fops. Defer clearing those until the knote actually owns them and update the comment to draw the line more clearly. Reviewed by: kib (cherry picked from commit 0bf4d22c37083170961c31694b90551538901a1c) --- sys/kern/kern_event.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 3df1ed5565d2..e10e57cdceb8 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1669,12 +1669,6 @@ findkn: kn->kn_fp = fp; kn->kn_kq = kq; kn->kn_fop = fops; - /* - * apply reference counts to knote structure, and - * do not release it at the end of this routine. - */ - fops = NULL; - fp = NULL; kn->kn_sfflags = kev->fflags; kn->kn_sdata = kev->data; @@ -1695,6 +1689,16 @@ findkn: goto done; } + /* + * We transfer ownership of fops/fp to the knote + * structure and avoid releasing them at the end of + * this routine, now that all of the remaining exit + * paths will knote_drop() to release the reference + * counts we held on them above. + */ + fops = NULL; + fp = NULL; + if ((error = kn->kn_fop->f_attach(kn)) != 0) { knote_drop_detached(kn, td); goto done;