From nobody Mon Mar 21 14:49:39 2022 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 EB7A01A30579; Mon, 21 Mar 2022 14:49: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 4KMcw36GFzz4mSB; Mon, 21 Mar 2022 14:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647874179; 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=+a3GAT9wzc2SQ6+nGmbdsDpqrIhf+re6oFKpAHVeCTo=; b=fQt75UWApe/YK95SlqzjWHqTSLVC8LvXIZUTLl9SmHu1zxcj6yllxlsjyZgbxDjgBaAxm5 vyUqAFYhA5ItwM+kUR5mz4c5oW3bS43MTOLJKQIeFJ9hQ2eAbQaNyXV2FKzYO+OTWs7Jm7 ry7g8dqTc5YeXsoPa5kk1g6/7X1xYL+CcRV3qtgNBBqDKoJAR2in0W/k9MgP6n8j+jrou9 xA9If7RnQ4icB1LNioJ/xtYelRpYqo2FCrw6vtL5JDil4838Dpx7h4IsmOHb1idIiCqvUy VB4Saons/X/FPSU8feEHmwjwlR0cM4MXa8aUteSTqoQd+jceEeYDvSMKOIpBdw== 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 B78AF1D065; Mon, 21 Mar 2022 14:49: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 22LEnd9C024142; Mon, 21 Mar 2022 14:49:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22LEndBN024141; Mon, 21 Mar 2022 14:49:39 GMT (envelope-from git) Date: Mon, 21 Mar 2022 14:49:39 GMT Message-Id: <202203211449.22LEndBN024141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 2411090f6940 - stable/13 - zfskeys: Support autoloading of keys stored on ZFS 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2411090f69401998569f24144b08ffc050e3cebc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647874179; 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=+a3GAT9wzc2SQ6+nGmbdsDpqrIhf+re6oFKpAHVeCTo=; b=Z8wwJN5Uy9XaeqRw0VGazGAmHtp0tmUCnsv5ZgJwBFjj1r5as3ESbxcG2Dr6GIRX8QJeNc 5M3FOxU1+23+OAcwraN9foHO+VvEDeDxNEcD9dBB5Z3ukDmkvl62xe0mbDdx63gDjPigak acC9WjgSPzq/IU2ifFtO3iqIumabvuAypBL+oD10X6c511hGbz6GKlvjVgxA8ytv4yRf0V xS3A34+UKQQfE4M451k4vuwfO1rdZwFmPjIeFny8vBNMlj0azLS/rb88fF+0btFBtRFN3+ 5xCvxTlgmp8i/0lfMhAxf5GRIgbzRE4GGqP8z6ywEaEZDW94qPctQ2h9CFCofw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647874179; a=rsa-sha256; cv=none; b=IdLssFRuRL8bLg0l9ojJ/Z9u9pdIWiy7lpzSzAK3GQYEzZ8NNy3UpCaFstzdeHgheBhPxY 5q6KIzMCIUeOGV9HptCs6GwM23R5UWnTiLcz0B526wJAGMdds5ZMuaGnkQjnoVh8qtFMZa WszcgohAy7gGB7vzX3n5dTGeXhutBu38LSAqMTawyzX1VqMLy8elRxiek/VIprLHv/Vc/p os5nS1G5z5yI3/nf7rbEf3b4bKxhG+yE7oxYanFknuN+19+tJ80YUxlp0udHqUr2VQeBsL gxc9FDLJu+WsqLer9mMhqHohUKcuDpcae4lOj/Jfl+3nU03SfOoplAqNMkuG9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=2411090f69401998569f24144b08ffc050e3cebc commit 2411090f69401998569f24144b08ffc050e3cebc Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-03-18 12:35:16 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-03-21 14:47:20 +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 (cherry picked from commit 97aeda2243568b386d792514996a06daec55eece) --- 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