From nobody Sun Dec 14 17:54:11 2025 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 4dTrRX4hwdz6Kb7R for ; Sun, 14 Dec 2025 17:54:16 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dTrRX3BmCz4J7f for ; Sun, 14 Dec 2025 17:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765734856; 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=PPsxVZyTP02jONLGOTlg3WRDtGVarRSVpmnRvm5l6mw=; b=w7VxfrGGPliYpPnZsGAM/Evx/YnImTLgfsRwpqVM8LroLEtfDUWJBeUrcpVzBnb3C+A7+7 f8qbslbCTZpnNb8Zs0Uvo3BM1goG+92+OkL+ngM0sgFc/g0ry3nSqMM8kz81EgaBIciJQ4 Xki+z7aI/EMPZqgmi/2RWOuVgRr36eXI14bqVG7+/F8XjQ6oMdR26AxcCwi7yK7SvcPKcX xWHaFtm0EC3yzqUtsvv6DBJKTqzTwt4eiTUX8sGaBggp9qAczRJKV+cSofIPB7lYCbEO0C 5J/TwzOOKOZmXsIom+6MKm0MXkSJcxE+LiawoNwY76c6nj24GhnYP78TzgaaGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765734856; 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=PPsxVZyTP02jONLGOTlg3WRDtGVarRSVpmnRvm5l6mw=; b=dC8xK7nDmjsj3LM6XQl8Ip6U3OWeEvsRAeYRzUpFpufGZpkPOZcmaNDCYlYkbhn1/wSOy5 S335YyurzVtdMJeonWu2PbS3eBNffsR12zqff6+3L/+FuTKQwdjs1LYrzm23fTwRwaKC9O 35SsE2M3FCDS0o3MNSzZfKGJTOCJJZKhNCLLgyP78rr0sxTUmxEII0RMlQARPTvxXHEi3I K6t1HD40z3E3U0cm0BbPEpYenoQoaXME8CiOAme+Djtfq4S+ryfU8+5eFdlhpKpW5ixFtE MTPJyTwQWPL6s8QQgzupnpLXMw6sDLNfA6MSqjj+gqgzZUXYIq1BrslDTExzag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765734856; a=rsa-sha256; cv=none; b=R1rExG9oAm0RrrLfbNWv3Kbo7LhY4T270wRJZpjhhMg23iNEtXlu+Ev5GVJfgt61uqRbzq PhNXoS0FJWq7ArCMoTgyGJK57uHI3CSMQN5TFcsO1hQfetzz1lj6qAhI/oSM1lPF14Vj3C k8eE00nDF+YxzDDfWzaAQnm1+35rwpd64NPjmVeHXu65ZnwGFpuYqvTXyS02MU8b9MdExW knBC+hjqHjh95tY6O954kbpQBqLhKcS/c8uK5nswExH9M271H/+mJN7/qQW666JNT2dfif Wgr2U/wYh8GPrIejCNNe9/IGsUL8fjaNKttOQtT7EGik/3aRSY0/UEDHFARexA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dTrRX2HFGzksf for ; Sun, 14 Dec 2025 17:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2172e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 14 Dec 2025 17:54:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fa259d156d43 - main - zfs: Merge commit 86b064469dc9c2 from OpenZFS 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa259d156d43966db95fe0f5cc15a0e6af206ff7 Auto-Submitted: auto-generated Date: Sun, 14 Dec 2025 17:54:11 +0000 Message-Id: <693ef9c3.2172e.2628d6a5@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fa259d156d43966db95fe0f5cc15a0e6af206ff7 commit fa259d156d43966db95fe0f5cc15a0e6af206ff7 Author: Mark Johnston AuthorDate: 2025-12-14 17:20:38 +0000 Commit: Mark Johnston CommitDate: 2025-12-14 17:44:37 +0000 zfs: Merge commit 86b064469dc9c2 from OpenZFS FreeBSD: Fix a potential null dereference in zfs_freebsd_fsync() In general it's possible for a vnode to not have an associated VM object. This happens in particular with named pipes, which have some distinct VOPs, defined in zfs_fifoops. Thus, this chunk of zfs_freebsd_fsync() needs to check for the FIFO case, like other vm_object_mightbedirty() callers do. (Note that vn_flush_cached_data() calls are predicated on zn_has_cached_data() returning true, and it checks for a NULL v_object pointer already.) Fixes: ef4058fcdc01838117dd93a654228bac7487a37c Reported-by: Collin Funk Reviewed-by: Sean Eric Fagan Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Mark Johnston Closes #18015 MFC after: 3 days --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 8a9d23d0d554..05ac77741d4f 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -5275,7 +5275,7 @@ zfs_freebsd_fsync(struct vop_fsync_args *ap) * Push any dirty mmap()'d data out to the DMU and ZIL, ready for * zil_commit() to be called in zfs_fsync(). */ - if (vm_object_mightbedirty(vp->v_object)) { + if (vp->v_object != NULL && vm_object_mightbedirty(vp->v_object)) { zfs_vmobject_wlock(vp->v_object); if (!vm_object_page_clean(vp->v_object, 0, 0, 0)) err = SET_ERROR(EIO);