diff options
| author | Tom Caputi <[email protected]> | 2018-06-18 15:47:12 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-08-15 09:49:19 -0700 |
| commit | 1fff937a4c9d7b745540387d232c5ab2ba856fea (patch) | |
| tree | d5806c401cc4d014e9a853f81196ff5c5103a044 /include | |
| parent | d9c460a0b659c044d4397b7405712f2c9450d3c4 (diff) | |
Check encrypted dataset + embedded recv earlier
This patch fixes a bug where attempting to receive a send stream
with embedded data into an encrypted dataset would not cleanup
that dataset when the error was reached. The check was moved into
dmu_recv_begin_check(), preventing this issue.
Reviewed-by: Jorgen Lundman <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Richard Elling <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #7650
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/dsl_crypt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sys/dsl_crypt.h b/include/sys/dsl_crypt.h index e92ae364c..8766ce51e 100644 --- a/include/sys/dsl_crypt.h +++ b/include/sys/dsl_crypt.h @@ -202,7 +202,7 @@ int dsl_dataset_promote_crypt_check(dsl_dir_t *target, dsl_dir_t *origin); void dsl_dataset_promote_crypt_sync(dsl_dir_t *target, dsl_dir_t *origin, dmu_tx_t *tx); int dmu_objset_create_crypt_check(dsl_dir_t *parentdd, - dsl_crypto_params_t *dcp); + dsl_crypto_params_t *dcp, boolean_t *will_encrypt); void dsl_dataset_create_crypt_sync(uint64_t dsobj, dsl_dir_t *dd, struct dsl_dataset *origin, dsl_crypto_params_t *dcp, dmu_tx_t *tx); uint64_t dsl_crypto_key_create_sync(uint64_t crypt, dsl_wrapping_key_t *wkey, |