From nobody Thu Nov 02 06:51:55 2023 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 4SLZL36C1Zz5084C; Thu, 2 Nov 2023 06:51:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SLZL35jbqz4GcQ; Thu, 2 Nov 2023 06:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698907915; 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=MnrfliLar5jTAr3044rCw+dMVM2v5hPWkZtY0wFIvY0=; b=c42V349iVEBynPoAIlxPnw3/M7puanwYFmPfBUCOh87PUpb2PpvNU6iUxC3sGn2a4ioh89 uFfkS8971YSR1FDD0CE7h0hQMnMFXkxiswMAhvVYB7/PuhK7C2vmO4NKtB+jufyc4N0G2W 3M3sol8Nr/JMJGT74r3I3fvGgeegYn6nHKroekx92AeJrOl1fZxOueqfAVFiKGs5sXQqZB EY8E7UMPrQ9phNuP9JO/adCrbJDnCIGiKBvK4w6g2pT1ahyfcfK6R87gKGSXSI8NrFfR1g rxbl5joTnXR9g8JtTF9HBWtxsxslAk/F0erfFXmcvFAL5FqACT0/2UdKDLnIog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698907915; 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=MnrfliLar5jTAr3044rCw+dMVM2v5hPWkZtY0wFIvY0=; b=UHQm13UWaYN/+o00wjrbwnHpZ8VD0sWBrIBKdoi6Od/tjF/u190xaCQM1D8lTjKxwOJ2tH c/DaUNl1ASXCU59+1TZXHXbnxKZPNM3gqjiM/yQC7kpKF8RzLtxemAdqPQN+qdMeA1qyw9 pCSHD5csXGYc1IpfEehFMJhF18xL+3Q1j0Tl//fNIYE6+mKTOnTjmZoDilMOcvquUfuDi8 ohx6DIUQfl2C3r8f3eFFdXKPqcenogQIS1UhhXLmLGJtkXePfxV8kxUsxXCFc2Nr2HTsRI EDUs7dnHd2dcvR7WSsBZ7J8sMijamF9lQ7bVbIrUs2dSpyuJpiBlAbESn0KltQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698907915; a=rsa-sha256; cv=none; b=Wh2rF826Rf2Oxfu7KC8Haz+AwnTaMsiMVdx9OBLiUsXBpbWtzXVI4QYMTbXAY13iPBoMZt Yj4Sh29zcebVWhflV2ExOHIpN8XG86Wvf/I9wySx8Q9FtsdqrJ2lHRqsII2ZfH0Qi5+cq6 0eKyATu9/JOELlHoeTrRSW31csyX7yNUeHaXAO4xoHYig1jci1bfAYcBo2P1lNEJaWeeXP UQdNXaz3lMAGfvVA830FX7arsSchgTBPAGMq0mXhPoGORJxc7Vk1/BkpYAHE5eovf6CxHZ VONwR5nbV+MoLYkh6Q6LoExPJoiKPBkJURl4i5FsX23yLfEZ/OCcyHbqUckzgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLZL34mRnz46G; Thu, 2 Nov 2023 06:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A26pt7t047952; Thu, 2 Nov 2023 06:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A26ptrs047949; Thu, 2 Nov 2023 06:51:55 GMT (envelope-from git) Date: Thu, 2 Nov 2023 06:51:55 GMT Message-Id: <202311020651.3A26ptrs047949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 96831a3ef1de - releng/14.0 - zfs: cherry-pick change from master 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 96831a3ef1dea365fb4104d29daad565ee5f71e5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=96831a3ef1dea365fb4104d29daad565ee5f71e5 commit 96831a3ef1dea365fb4104d29daad565ee5f71e5 Author: Martin Matuska AuthorDate: 2023-10-31 20:49:41 +0000 Commit: Martin Matuska CommitDate: 2023-11-02 06:50:52 +0000 zfs: cherry-pick change from master #15465 763ca47f Fix block cloning between unencrypted and encrypted datasets Fixes a kernel panic when block cloning is enabled and system is trying to read data from a file copied using copy_file_range(2), e.g. with cp(1) from an unencrypted dataset into an encrypted dataset on the same ZFS pool. As the file has not been encrypted, to fix the filesystem inconsistency and to avoid future panics it must be deleted (metadata is readable). Approved by: re (gjb) Obtained from: OpenZFS OpenZFS commit: 763ca47fa81808be62ab5e02357e896233f24abc (cherry picked from commit c5eb93ef57f4905f7aea9566ab45be1a75ada150) --- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/openzfs/module/zfs/zfs_vnops.c b/sys/contrib/openzfs/module/zfs/zfs_vnops.c index 40d6c87a754e..84e6b10ef37c 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_vnops.c +++ b/sys/contrib/openzfs/module/zfs/zfs_vnops.c @@ -1094,6 +1094,15 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp, ASSERT(!outzfsvfs->z_replay); + /* + * Block cloning from an unencrypted dataset into an encrypted + * dataset and vice versa is not supported. + */ + if (inos->os_encrypted != outos->os_encrypted) { + zfs_exit_two(inzfsvfs, outzfsvfs, FTAG); + return (SET_ERROR(EXDEV)); + } + error = zfs_verify_zp(inzp); if (error == 0) error = zfs_verify_zp(outzp);