c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

zfs_ioc_unload_key can drop extra spa ref

Browse Source 
Reviewed by: Thomas Caputi <tcaputi@datto.com>
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Don Brady <don.brady@delphix.com>
Closes #7759
This commit is contained in:
Don Brady 2018-08-03 15:50:51 -06:00 committed by Brian Behlendorf
parent 6da0998f59
commit fc1ecd16d7
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
module/zfs/dsl_crypt.c
View File

@ -469,8 +469,10 @@ dsl_crypto_can_set_keylocation(const char *dsname, const char *keylocation)
goto out; goto out;
ret = dsl_dir_hold(dp, dsname, FTAG, &dd, NULL); ret = dsl_dir_hold(dp, dsname, FTAG, &dd, NULL);
if (ret != 0) if (ret != 0) {
dd = NULL;
goto out; goto out;
}
/* if dd is not encrypted, the value may only be "none" */ /* if dd is not encrypted, the value may only be "none" */
if (dd->dd_crypto_obj == 0) { if (dd->dd_crypto_obj == 0) {
@ -778,8 +780,10 @@ spa_keystore_load_wkey(const char *dsname, dsl_crypto_params_t *dcp,
/* hold the dsl dir */ /* hold the dsl dir */
ret = dsl_dir_hold(dp, dsname, FTAG, &dd, NULL); ret = dsl_dir_hold(dp, dsname, FTAG, &dd, NULL);
if (ret != 0) if (ret != 0) {
dd = NULL;
goto error; goto error;
}
/* initialize the wkey's ddobj */ /* initialize the wkey's ddobj */
wkey->wk_ddobj = dd->dd_object; wkey->wk_ddobj = dd->dd_object;
@ -904,8 +908,10 @@ spa_keystore_unload_wkey(const char *dsname)
} }
ret = dsl_dir_hold(dp, dsname, FTAG, &dd, NULL); ret = dsl_dir_hold(dp, dsname, FTAG, &dd, NULL);
if (ret != 0) if (ret != 0) {
dd = NULL;
goto error; goto error;
}
/* unload the wkey */ /* unload the wkey */
ret = spa_keystore_unload_wkey_impl(dp->dp_spa, dd->dd_object); ret = spa_keystore_unload_wkey_impl(dp->dp_spa, dd->dd_object);
@ -1205,8 +1211,10 @@ spa_keystore_change_key_check(void *arg, dmu_tx_t *tx)
/* hold the dd */ /* hold the dd */
ret = dsl_dir_hold(dp, skcka->skcka_dsname, FTAG, &dd, NULL); ret = dsl_dir_hold(dp, skcka->skcka_dsname, FTAG, &dd, NULL);
if (ret != 0) if (ret != 0) {
dd = NULL;
goto error; goto error;
}
/* verify that the dataset is encrypted */ /* verify that the dataset is encrypted */
if (dd->dd_crypto_obj == 0) { if (dd->dd_crypto_obj == 0) {

3
module/zfs/dsl_dir.c
View File

@ -501,7 +501,8 @@ dsl_dir_hold(dsl_pool_t *dp, const char *name, void *tag,
} }
if (tailp != NULL) if (tailp != NULL)
*tailp = next; *tailp = next;
*ddp = dd; if (err == 0)
*ddp = dd;
error: error:
kmem_free(buf, ZFS_MAX_DATASET_NAME_LEN); kmem_free(buf, ZFS_MAX_DATASET_NAME_LEN);
return (err); return (err);