diff options
| author | Christian Schwarz <[email protected]> | 2020-10-14 23:04:19 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-10-16 13:05:28 -0700 |
| commit | 05f8be3b49df5622b590d17ae328c886b7a1212e (patch) | |
| tree | 3637b8a26d234e3f7e5ad231f053b436d5c73dfb /module | |
| parent | d8091c929488ba9ba4113ac1b5e00e018c92f39f (diff) | |
Fix crash caused by invalid snapshot names in redactnvl
This is a follow up fix for commit 0fdd6106bb. The VERIFY is
only true when we haven't hit an error code path. See added
test case for a reproducer.
Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Christian Schwarz <[email protected]>
Closes #11048
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/dmu_redact.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/dmu_redact.c b/module/zfs/dmu_redact.c index c53fba75c..225ec4053 100644 --- a/module/zfs/dmu_redact.c +++ b/module/zfs/dmu_redact.c @@ -1062,9 +1062,9 @@ dmu_redact_snap(const char *snapname, nvlist_t *redactnvl, } } - VERIFY3P(nvlist_next_nvpair(redactnvl, pair), ==, NULL); if (err != 0) goto out; + VERIFY3P(nvlist_next_nvpair(redactnvl, pair), ==, NULL); boolean_t resuming = B_FALSE; zfs_bookmark_phys_t bookmark; |