summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]lib/libzfs/libzfs_dataset.c3
-rwxr-xr-x[-rw-r--r--]module/icp/core/kcf_sched.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 794d35fbe..bd90bf0bf 100644..100755
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -1572,7 +1572,7 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
char errbuf[1024];
libzfs_handle_t *hdl = zhp->zfs_hdl;
nvlist_t *nvl;
- int nvl_len;
+ int nvl_len = 0;
int added_resv = 0;
zfs_prop_t prop = 0;
nvpair_t *elem;
@@ -1602,7 +1602,6 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
* Check how many properties we're setting and allocate an array to
* store changelist pointers for postfix().
*/
- nvl_len = 0;
for (elem = nvlist_next_nvpair(nvl, NULL);
elem != NULL;
elem = nvlist_next_nvpair(nvl, elem))
diff --git a/module/icp/core/kcf_sched.c b/module/icp/core/kcf_sched.c
index 8102d6675..7046495f4 100644..100755
--- a/module/icp/core/kcf_sched.c
+++ b/module/icp/core/kcf_sched.c
@@ -496,7 +496,7 @@ kcf_resubmit_request(kcf_areq_node_t *areq)
kcf_provider_desc_t *new_pd;
crypto_mechanism_t *mech1 = NULL, *mech2 = NULL;
crypto_mech_type_t prov_mt1, prov_mt2;
- crypto_func_group_t fg;
+ crypto_func_group_t fg = 0;
if (!can_resubmit(areq, &mech1, &mech2, &fg))
return (error);