From nobody Tue Dec 16 23:42:59 2025 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 4dWD4z69hWz6LQ0X for ; Tue, 16 Dec 2025 23:42:59 +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 4dWD4z4ky8z3G23 for ; Tue, 16 Dec 2025 23:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928579; 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=9vTN2Ein4IgWcO5d4SUyLGWF4bG2I1oJNcOL5QjoIrE=; b=L696cHq6/sFzTongg4g51y8HDsn+YPiE+kRe2lEaOtIHriFDOijQa0mjIW669mObAlNXV2 5vImBa7BespR8EnKiv3qUj42O5q4OPgzoyTeuiCqCT+amxF2GL7tUrsXzrtyd4YUDVbcdA VO5pQd48pSk0kFFrcrr0MSWmo/on5tScJ9FGV50RaNZBdkQJlgMmE+4qmMMZ5bBnz+qTWB 4X/j+Li6xuW8KLxP7tmUDWvYkV54EPZG2RoeG+E6yC0xCKRJ5IEi3/ZqvvgWXXmjO8y412 TEGOOC1e0FWVLp/S1VLHIJFEOsPm00TRA+jknOzhwfD5SGJSrpPW9mAW8Po+Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928579; 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=9vTN2Ein4IgWcO5d4SUyLGWF4bG2I1oJNcOL5QjoIrE=; b=vvXoKs+yWs0XFiKjuQ4ylm8u3e1nIRtRM+iMqwj7gtiu/TnW0a0YWuG8NmyaTamtUM8wvp ZFbdxBcSCY8Hmu9KLi/niWGfQiHcJ++84uT79ua+T+54PbILzVn8hRzx/fAicoj5scaPbx GwoDvL2S/m7P35sPxMlfrHsmFej2nFvkMAAmVLeVz8Z9De9NAnH+eLoZib5G2m3UA8s8dY teuPl8UiOgQGavjE16JIQEHT4iDsN9Oianrh95AD1DgpDtw/V5q6wFsINZDk4bpeNmWHeI Uf5gyqgTpYILJ1+BOLg+5PqljWSSeHQN5Tk0Gcf8Qrtfu1Id9wT3lq1AH72TXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765928579; a=rsa-sha256; cv=none; b=N7dd+33Gi5ulg32/I4XZCpDhJB6U7H+RMNjpItzbVv8FbEFD/6gATimNlyAY1Nb95QkBIu W4LqNB4fEpvdqv+nzSNr4Kyi2Ws5NcfchtwGJTm19Tk85cuugQkMy1EWfRQWmrEEaXpK6q KjWSLW+9PGKYdU1iPGIfI+s7xlLQEJR4UW9aEwG9ukVlQKBgf33ya2SykY/EFLE8YTkCzv hPi2wliBrG/ed7hxbCldoYUxvL2ehTXIZTD61nq/uaEshv0Gt3RWEqTFUQZ/EEU2r4RNTP VLgwkAKGGLhgsXMDd483ZTPrSMmYRoIeLUHPe6qEeeJJR/EobJC6nLrhvb8BsA== 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 4dWD4z4LMLzCRv for ; Tue, 16 Dec 2025 23:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2397e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 23:42:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ff6b9c7c1c34 - releng/15.0 - zfs: Merge commit 86b064469dc9c2 from OpenZFS 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ff6b9c7c1c3494f143879a98d645f5e682babf2c Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 23:42:59 +0000 Message-Id: <6941ee83.2397e.32ee3da2@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff6b9c7c1c3494f143879a98d645f5e682babf2c commit ff6b9c7c1c3494f143879a98d645f5e682babf2c Author: Mark Johnston AuthorDate: 2025-12-14 17:20:38 +0000 Commit: Mark Johnston CommitDate: 2025-12-16 16:01:07 +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 Approved by: so Security: FreeBSD-EN-25:19.zfs (cherry picked from commit fa259d156d43966db95fe0f5cc15a0e6af206ff7) (cherry picked from commit d988a0c1fc4cf75d5c4c9820fd2a5619d59ac608) --- 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);