From nobody Wed Nov 1 09:29:46 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 4SL1tg1X10z505ZG; Wed, 1 Nov 2023 09:29:47 +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 4SL1tg13Wqz3R5L; Wed, 1 Nov 2023 09:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698830987; 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=jsHurrNvAP9Lg5gYxwV7vZ5/5Of7d9fJaMmpwV4oGVo=; b=WqQk22M+F9p2tdMg2ehOoLCcZKquU6sfbJTpU7HQsngVT8e80pEq6oBgWG+DtbhN69i5Np hIFZ4XwlFA7OnsPQv/hmd1PJshKZbk7jh7vMKCo4HhfXMRs7Ls1SVkbfk7NNwPYEi8Rsai XweR34hxh0/QE6Fotdf+sWeFt2ORSMf8/DN7UTqaGEgh7Z74f4HLUBcgLlPYcKkfRKirOK +NAa3lSD4wD4laEJzJyLGL8TVV9KKoIaZuRAuH2qdvVVVO5YBMuxitqAkErjjcw0HQkcvJ DgYu6gDYlKhEqx0qb3J5IH1mP4JwY/f4QO9ixIxasJGH9+usRb5suzO4qE/XwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698830987; 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=jsHurrNvAP9Lg5gYxwV7vZ5/5Of7d9fJaMmpwV4oGVo=; b=ptGhqkeIoW/5YkbFHjfzdsuuvGE8lcVvvEM+mMDseHqlIm4ZMcEx5gtdPfD+mIrUiQ0gue 3B4xgIGQn79YI7Nga66UWCxhwQIzI2SxR1hmf3Uic5wxXPjG0ofaIZSilBE8WdSUS18RwV W9tkcMWtx6vTk0Jcgg5Nky/2NRcHjsWl49zQ2SRdHgb2qv/H9l+lxw+D7ve6alu7fFBjhJ mmiv9wzFRbm99/QQkSsX4V9S+Gj+oOX0PVjrC5SMcnzg9oDtSh7V7GGmyLsMNjg0QgqDxw AB3Z1MNe6tleOd0EB63FkwVpRzBjtsozLNq6r8hrk3hk7Ti+J9qS5cJ0hmpxTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698830987; a=rsa-sha256; cv=none; b=AAV14Xb9ZNUCcmqHn/vydC6DZ3ZLIBTGJAThrJUUK07zhcWXU78sLMBqFXRDkBD60wQKPJ uAl4KZJtGYlcAqkgzAx8Th09AAPXY6uCal0q6yv0E3CGUgammZBfifAC0i5B1RqJIN9nsW dS9D0a8PJbnbJLFpCtD4P/13aXkk38YdSOBfsvXilg3PUpoU9ImN72tsLwFqIgBnfj28ps eLn7hWzlxMkS0zEhTVu6Vd6hHnJUgEf5EIeK16Urg/j5DWyC8JxgYnJdNKXLGz7/EOZguV U0cIi1kGBkBbkEvA3LAMjSgulHp3uEEFN20PakC/DPAfQkQubxDP5Mfzg+EaGg== 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 4SL1tg074rzh4R; Wed, 1 Nov 2023 09:29:47 +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 3A19TkEh099506; Wed, 1 Nov 2023 09:29:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A19TkvM099503; Wed, 1 Nov 2023 09:29:46 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:29:46 GMT Message-Id: <202311010929.3A19TkvM099503@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: c5eb93ef57f4 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c5eb93ef57f4905f7aea9566ab45be1a75ada150 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c5eb93ef57f4905f7aea9566ab45be1a75ada150 commit c5eb93ef57f4905f7aea9566ab45be1a75ada150 Author: Martin Matuska AuthorDate: 2023-10-31 20:49:41 +0000 Commit: Martin Matuska CommitDate: 2023-11-01 09:29:34 +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). Obtained from: OpenZFS OpenZFS commit: 763ca47fa81808be62ab5e02357e896233f24abc --- 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);