diff options
| author | Tom Caputi <[email protected]> | 2018-11-07 18:40:24 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-11-07 15:40:24 -0800 |
| commit | f44ad9297da6e638482232636e9d63302b96f7e9 (patch) | |
| tree | 2f1c1417ec38b3b54a0f977fd864c9005ad57c67 /module | |
| parent | ac53e50f799b39d9cd04e5ecc0a6552c9490c84a (diff) | |
Replay logs before starting ztest workers
This patch ensures that logs are replayed on all datasets prior
to starting ztest workers. This ensures that the call to
vdev_offline() a log device in ztest_fault_inject() will not fail
due to the log device being required for replay.
This patch also fixes a small issue found during testing where
spa_keystore_load_wkey() does not check that the dataset specified
is an encryption root. This check was present in libzfs, however.
Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #8084
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/dsl_crypt.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/module/zfs/dsl_crypt.c b/module/zfs/dsl_crypt.c index d2545c6fa..da2a126f2 100644 --- a/module/zfs/dsl_crypt.c +++ b/module/zfs/dsl_crypt.c @@ -758,7 +758,7 @@ spa_keystore_load_wkey(const char *dsname, dsl_crypto_params_t *dcp, dsl_crypto_key_t *dck = NULL; dsl_wrapping_key_t *wkey = dcp->cp_wkey; dsl_pool_t *dp = NULL; - uint64_t keyformat, salt, iters; + uint64_t rddobj, keyformat, salt, iters; /* * We don't validate the wrapping key's keyformat, salt, or iters @@ -775,7 +775,7 @@ spa_keystore_load_wkey(const char *dsname, dsl_crypto_params_t *dcp, goto error; if (!spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_ENCRYPTION)) { - ret = (SET_ERROR(ENOTSUP)); + ret = SET_ERROR(ENOTSUP); goto error; } @@ -786,6 +786,13 @@ spa_keystore_load_wkey(const char *dsname, dsl_crypto_params_t *dcp, goto error; } + /* confirm that dd is the encryption root */ + ret = dsl_dir_get_encryption_root_ddobj(dd, &rddobj); + if (ret != 0 || rddobj != dd->dd_object) { + ret = SET_ERROR(EINVAL); + goto error; + } + /* initialize the wkey's ddobj */ wkey->wk_ddobj = dd->dd_object; |