From nobody Fri Mar 18 13:55:38 2022 X-Original-To: dev-commits-src-main@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 329B81A136E2; Fri, 18 Mar 2022 13:55:39 +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 4KKls70wyzz3HbB; Fri, 18 Mar 2022 13:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647611739; 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=c8AvZxZDS3YCceSlCdc8z4zc9W0wvXnqezDU4G3M5a8=; b=Pcr6V54wHfjW9F5hyZSApt7ruHAuenMWHXzogE4X4Wbbt065SI/sCf5UQqWpebHdhQ837r gX5sawxutZWG1dDVOw4c5QE5HOrtq9SfmMdfMiKO3H47RIUOLX5c+4bCzPYuO30Fhr8D+k fs+rXbCJFkwn3nTx29oNGa67sb1NPke757HnfMNo4uHbnIRcs+tx/jSN28WhSSJNJUlzx+ hNwSfCMmkenZ0/nmsxyYaTYzQPrV9+DhPS/iYb4/ZQjzpn2Ah/CcD9qKunXurEsVKM7WTE uU2LmCHx/yYmjTpR6To4iw9GxRHsUXFjlP/X3C+5zxuUvR6Xz3jpRDqGp6Y+VQ== 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 017D520215; Fri, 18 Mar 2022 13:55:39 +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 22IDtcVc044049; Fri, 18 Mar 2022 13:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22IDtc03044048; Fri, 18 Mar 2022 13:55:38 GMT (envelope-from git) Date: Fri, 18 Mar 2022 13:55:38 GMT Message-Id: <202203181355.22IDtc03044048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 97aeda224356 - main - zfskeys: Support autoloading of keys stored on ZFS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97aeda2243568b386d792514996a06daec55eece Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647611739; 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=c8AvZxZDS3YCceSlCdc8z4zc9W0wvXnqezDU4G3M5a8=; b=jE08OsupVr9slyZaF7mkkr0FVJTsLlE7gg6tLLG5JwK0IZCzWHme/EQsi2t/Oge734L55z nQN0ZhWaDU6eLufom6Pk7xnpMT+9eC959pO+kyNZBwoYnLaBXynlsc7c/Q9bg8ixdRw7Rx N3LNTme1Fid4QPKjINo/DPQ+KjI21i6x5Q23c4sh5ZmqIrIBPL2HZ7CkudaUT/jFIT18bw sYtARsU9R4nkbQAV4RHtoetAd9gcpgzMnEZkrFV65DBUh4QDko6MwXjnApFjkEDNfJJH0z T+NdYCNtNTFRmfBzvNesUNEHIdyjeMSHJodggDDn3iRL3oMzMrqUuQuXLr4Y3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647611739; a=rsa-sha256; cv=none; b=ejshH66dgL23B+qy7q+Cpf+Ms/B+q21m+QVG4DInFvvgGKhH5c6Z+8B06HSTotU1E2QGqV 9M/C2vwr4MebjERD+8YOMDpYm8FLODpHHqROA6APYAekdjUvk1aHCk9Y8n88pGLwZf4+fw 6JtP1O2PCFN3Zg/TqixZzbRsT6Z1P0EW0OfB2ld/KReoJy5YWKFe0Hm6svogWI9uXcoZ+U w8WbTmMwZLcWktWVbkkCYFC6gtzBVcmTJB1xchAz6xeUZWdefeOQxtagTh6qEeNfK1Icuq O3GifFw/kHTIDLnC1I7caQ/eTpZrJwsM+7T6S2XRabzEaxNOGX4UOMdVPa42gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=97aeda2243568b386d792514996a06daec55eece commit 97aeda2243568b386d792514996a06daec55eece Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-03-18 12:35:16 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-03-18 13:53:52 +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: allanjude (src) Fixes: 33ff39796ffe Add zfskeys rc.d script for auto-loading encryption keys MFC after: 3 days Sponsored by: Modirum Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34601 --- 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