From nobody Mon Apr 13 04:01:57 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 4fvDHp3lHwz6YCXk for ; Mon, 13 Apr 2026 04:01:58 +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 4fvDHn65xWz3wSx for ; Mon, 13 Apr 2026 04:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052917; 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=LsucKv5MLwPIIQo0eIDuu3XVG87AwRZSFy9kj095IKY=; b=RWhWIUH80cuankCz33+yRXeJ6xIVOHevM10bT4B9YuwRC3NOqJy75O03HPx49Y/3jLBXSp Oys7dyqw3EI5NiaBwrDvdgPdjyV0yom6mI6QCwCh6K3KpP+pRmrxIOKNOmK88ED/RVBURn QjdW1eD3qxSR1LVU1SjiXPmr1klNY81T0XzCAINVbgkdLBmxz4jnbvw+h/kpUXzqrL6LX+ dqoWWznoCRObQzoes1sFRgmEoscydVIgLZ3eAe06d4O4q54qiU3AHzD9bU6VVI6Y7J9fcd eg+xMX9yj7VLRTay8QrsajMDxFD2yjODtafOBOWxtQOuvQmwMDWSsQKY0jWn2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052917; a=rsa-sha256; cv=none; b=tbdbzpXzd9TTI9fZH7m0kYb9XR80pk1bd6bLhG8BqFuPo3MhI8itdfIScsT6bs/Fjtp79W VipdObEn6kXeDYSzHzFaHBoa9wwlvtTpO1wV+4RrhooHL1EGa8n7ryK8Ro7mEzB1tk7Gbr fG0aPGX5pmElv4I50tLSksYmLEskEcCiHSz+GbrDLHg9Qizn1fyOPDRTnPHKjnUwciJOZC Nq82vX4nIxzZrmnqnb5cQ59KwrsSH25L7QuWrAMy/0gSb2wNW0kr50aKbNKgRR9s9l3sHE s6sC8aIOQzre0VygB7MqnBjUatSNXHTbWusGNC/tgGk+0cfbEClcfuOjLD7G4g== 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=1776052917; 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=LsucKv5MLwPIIQo0eIDuu3XVG87AwRZSFy9kj095IKY=; b=P0hNsveKEjuQzf0pvQfs8r8MCCUkkxexpQweh7LiAStUpkuaGlPOwVy18/zuL7hNkDaRkI EhTsbBjgxXiAj1uaL/chnt3FHuFYlMTi/QK3WcjhSEJjRghXhqjnwYSCuSy85qmrNtGkai MFTlPGJBCJNXCnd0NXHAwxW+TNlXYi3dU7NXLd/sajuAzYvFlns15CkbtS0C7SBNzqhJfs c1JqmHrWlu3yDOSB37/yF5a+1DWII/+HvwUfPeiFRNpk1DCki5YoR2957VOZg+/d3LDrhR dqi1FXgyeYtn7po5fApbKaFi+N81aYsCgxI9v6MWruQtXbinMaURMaIzA7ROog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHn5R2Lznwp for ; Mon, 13 Apr 2026 04:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e318 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 60618b0b57dd - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 60618b0b57ddd49f56e1d1f07e132b765a8f840a Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:57 +0000 Message-Id: <69dc6ab5.1e318.1b660de7@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=60618b0b57ddd49f56e1d1f07e132b765a8f840a commit 60618b0b57ddd49f56e1d1f07e132b765a8f840a Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:52 +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 6e16c40a531c..4db5c6669470 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1822,12 +1822,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; @@ -1848,6 +1842,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;