From nobody Wed Mar 23 20:28:33 2022 X-Original-To: dev-commits-src-branches@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 A17A51A26BD9; Wed, 23 Mar 2022 20:28:33 +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 4KP0L947lbz4cYv; Wed, 23 Mar 2022 20:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648067313; 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=e2mccVm+e3DJ6/VlyZMnonI34em3h3MzYxuhI8RH4Es=; b=JICb6h5d0t73p1zCgFC5V8jMouHeuWlz2Gt57mbLhy0BzsPWz/IDbX+xKhUG90lsjZgn8i Nz3yarGbU4L8Li7WWIcPtyj5DSuWpzakKHSuBkmMyVLXk97UpJHyCeTevEykhmp76IVeSd bdvBbNV1JsVKIzymHZa0YQ7iUVePpkC0+rh+D5t5iXevrQlMlUr3UFFj2pDUm6i9F2uj4L x4TQQqbO0wmWPbuLbmS1WR8yo0rvwmoCA7+NY6u0ib5pRo5m/Mz+VM6Aflemkgg7+qnmAu rns823DWh17x6L3c1cjcAmDahD85AHoflZNOddL40ZQsZRizHuJ7kAqado7XHQ== 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 6DD622587; Wed, 23 Mar 2022 20:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22NKSXn5062508; Wed, 23 Mar 2022 20:28:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NKSXmW062507; Wed, 23 Mar 2022 20:28:33 GMT (envelope-from git) Date: Wed, 23 Mar 2022 20:28:33 GMT Message-Id: <202203232028.22NKSXmW062507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: f23b24655f7c - releng/13.1 - zfskeys: Support autoloading of keys stored on ZFS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: f23b24655f7cb3626d69f64f60b215a4870c3722 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648067313; 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=e2mccVm+e3DJ6/VlyZMnonI34em3h3MzYxuhI8RH4Es=; b=XEypFxYG8rtpjbdemcNcDk7WSVX9Go0lnQSp2Irfxj2e6HvmMCvZPs6R9qNo7jlb33ST2v 8H5k7X2Qm9zPp0MTgqJUfoDjG/nu9wFELwMUzh3PdmuSll8OrzTUx9GaLLGO0EqOy1k8wi QA63jQ2ZUkyD+mMgvrZPGjB/tHqXd8eWmHeSWa7pB5+uLXlc5L4vQyfs9tOZEu4eMJX7kJ wULPem6AYUSAJoAfZzMFJVNu8fFWI/Op9BujlFq3GoPSmeHGLKiYlzJfg5EK4KQECyoWVC 3yp7RasRORogslvkhbqjKKk1eVpSsHR5JRl3Ep4p4QpRuEQ3oWkJaOBPU2xx3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648067313; a=rsa-sha256; cv=none; b=WfkBBJMHaG0Qc2uQX8doJo50mBc7m2Qzy1RDj+VmXuGRfRYTJeEDZ9bOysRz5TXrZwSiUd PHTk4hREGzHQ78A9tqnzKpSfNpXc9q65Vbl2B6GWQ4m5xufwtr65sg1xalPOnFot+HAQrr OnNYYp0YfIF5Bjff3FLy3qGs8FZmLo3p0k51+PJyRLdk1H2a1VshsEqyZ0Ggx0Ov3c0RLy AW80xLrookwPv+NHsVKPCfQGnOcUBLR/Q39Osb4uyP2ppRxs7lRyodHLmu7eGFUmY+przV /IBaYHPrkD94MFPLhyJAxR526uW4p0wnlwTaP5s4MdIM4JzVoTdzjpQ16iHyng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=f23b24655f7cb3626d69f64f60b215a4870c3722 commit f23b24655f7cb3626d69f64f60b215a4870c3722 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-03-18 12:35:16 +0000 Commit: Glen Barber CommitDate: 2022-03-23 20:27:44 +0000 zfskeys: Support autoloading of keys stored on ZFS The zfskeys service script starts before the zfs service script, so that dataset decryption keys are available when `zfs mount -a` is run. One of the potential edge cases of this design is that if a key is stored on ZFS it won't be loaded until `zfs mount -a` is issued. In order to address that let's try to load the additional keys and mount related ZFS datasets after the zfs script finishes its standard mounting procedure. PR: 262468 Reported by: Graham Perrin Reviewed by: allanjude Approved by: re (delphij) Approved by: allanjude (src) Fixes: 33ff39796ffe Add zfskeys rc.d script for auto-loading encryption keys Sponsored by: Modirum Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34601 (cherry picked from commit 97aeda2243568b386d792514996a06daec55eece) (cherry picked from commit 2411090f69401998569f24144b08ffc050e3cebc) --- libexec/rc/rc.d/zfs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libexec/rc/rc.d/zfs b/libexec/rc/rc.d/zfs index 2d35f9b54642..dbc82f82c65b 100755 --- a/libexec/rc/rc.d/zfs +++ b/libexec/rc/rc.d/zfs @@ -13,6 +13,7 @@ name="zfs" desc="Mount and share ZFS datasets" rcvar="zfs_enable" start_cmd="zfs_start" +start_postcmd="zfs_poststart" stop_cmd="zfs_stop" required_modules="zfs" @@ -41,6 +42,17 @@ zfs_start() fi } +zfs_poststart() +{ + # Some of the keys to decrypt datasets are potentially stored on ZFS + # datasets that just got mounted. Let's try to load those keys and + # mount the datasets. + if checkyesno zfskeys_enable; then + /etc/rc.d/zfskeys start + zfs_start + fi +} + zfs_stop_jail() { if [ `$SYSCTL_N security.jail.mount_allowed` -eq 1 ]; then