From nobody Thu Apr 17 01:05:54 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 4ZdKTH3Vcvz5tVpR; Thu, 17 Apr 2025 01:05: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdKTG5kJdz3YJy; Thu, 17 Apr 2025 01:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744851954; 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=ET0kEh6Zu5mKAYEDlTD9NE+Nyl795rCkXbxM9Ig36p8=; b=iRkwj/fmSESMv6g8Jt2S0bcNKzeLfQVotRcZ4U+WscCDNi0zKi6lFdH9kK4rAW29GZB7P4 v1KNX24yBNqPpGJ1SAjHbxBARuBga7HUC0hbZDKxGOWfKzALiNdBbL5QaOJfuIbNSDhoG/ xQTZv8+MNVSbkb4gW6LgsP78KBZQ48xL9sN/v794WFtexjYfPlK4UOd30kSeyDNdXNQaFW sz81utokdEQrdBXpVNdmtVFK1HvoyMDR0MySHlW1jdY4Fg/pbWE5vJNDTyjeOLaRcKkBP0 Tm95V5tKz0VIfATyaJ3X9DR0i9p1reSVO4xT3uoovXta84Rk3G4DeXddbCVBNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744851954; a=rsa-sha256; cv=none; b=yzFMklLgIR9lOZ2DjZOGNkQsdOGFZCka4bXwQ27VRX3nGLcnq2DssUM7hTyFxnZaCaWftZ 3Jm27zTQeq1G3qAtRtesTL5QH8WRAfVdgmDoOdaH7RD3J7kIQNXNaSZBGwrCBqaDf5eMhq gxrCTgu1tpWuqfq3HKVIFN8iTWgKtzF/qnarJpeIKbg/Dep7nTSX8gwhHuCckV+00Khx6N vjXt9Mpu9US4pEdLURpIHamSbZtGJXWW6TZtSzahHh1aUXrl5yyjcLz065ikevoKQylsYj 3S8QTO69OpRpskT/5cV49Tb7FNu+hfln+IP7+qgTHmZQvcm8DJxeT/VsTFT2ZA== 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=1744851954; 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=ET0kEh6Zu5mKAYEDlTD9NE+Nyl795rCkXbxM9Ig36p8=; b=MO4z9i/eyXQDLk1I0nC252zYOaVn+kej3NaR+6lDtcjt/QCvTeTHB50DWJ6qQb1I4GSjQK srrYeV5bZB2JLqjY8cWAEKGNaYDYaAwCoV5xs2v+E42/sHn+pjiJiAXIgT+/543bAQRjWD i1oPdoeRnDZITvckwkBsCUdPdUjgaPUNWbZ0gAuC7enkXEnYEjgwEiMSrwio5A2C1orl+K /UzO4ihdg8jI4L5NUa7c+wNcvpa7cQAupI4n8R+oPtql0w8e9MjPEFT6E9AHrovyXvY09Z vyp/ReDpFRNXviDFNWI5viBQKMcfYDztPAFxusSfFOyYeIm2TohIMLuNjlFLpQ== 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 4ZdKTG5KQwzB37; Thu, 17 Apr 2025 01:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53H15sU2062376; Thu, 17 Apr 2025 01:05:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53H15sJc062373; Thu, 17 Apr 2025 01:05:54 GMT (envelope-from git) Date: Thu, 17 Apr 2025 01:05:54 GMT Message-Id: <202504170105.53H15sJc062373@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: a5b392de86f9 - stable/14 - libbe: avoid copying encryption-related props 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/14 X-Git-Reftype: branch X-Git-Commit: a5b392de86f9e9949072ab4b7caf1439aa00a571 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a5b392de86f9e9949072ab4b7caf1439aa00a571 commit a5b392de86f9e9949072ab4b7caf1439aa00a571 Author: Kyle Evans AuthorDate: 2025-02-26 22:23:24 +0000 Commit: Kyle Evans CommitDate: 2025-04-17 01:01:18 +0000 libbe: avoid copying encryption-related props libzfs insists that these be cloned from the origin, so avoid making a deep copy of them ourselves to unbreak creating a new BE from a BE with encrypted components -- in today's environment, without a loader that does encryption, this means a deep BE setup where something underneath the BE (e.g., home directories) are encrypted. Reported and tested by: arrowd Reviewed by: allanjude (cherry picked from commit 181549c37f1913f5ca292d8515a6e5e0068a9fe7) --- lib/libbe/be.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 38e5e44abb53..a9838f2200bf 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -670,8 +670,20 @@ be_deep_clone_prop(int prop, void *cb) dccb = cb; /* Skip some properties we don't want to touch */ - if (prop == ZFS_PROP_CANMOUNT) + switch (prop) { + /* + * libzfs insists on these being naturally inherited in the + * cloning process. + */ + case ZFS_PROP_KEYFORMAT: + case ZFS_PROP_KEYLOCATION: + case ZFS_PROP_ENCRYPTION: + case ZFS_PROP_PBKDF2_ITERS: + + /* FALLTHROUGH */ + case ZFS_PROP_CANMOUNT: /* Forced by libbe */ return (ZPROP_CONT); + } /* Don't copy readonly properties */ if (zfs_prop_readonly(prop))