diff options
| author | Andriy Gapon <[email protected]> | 2015-07-02 16:04:35 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-07-06 09:31:30 -0700 |
| commit | 71e2fe41be982076f14fe5d39bcf5f7051a937f0 (patch) | |
| tree | 2fe4bea37b0c19ea436dfee19838e75dc822215d /module/zfs | |
| parent | b6640117f07c50f5fc3093c6b50de988cf332e72 (diff) | |
Illumos 5946, 5945
5946 zfs_ioc_space_snaps must check that firstsnap and lastsnap refer to snapshots
5945 zfs_ioc_send_space must ensure that fromsnap refers to a snapshot
Reviewed by: Steven Hartland <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Gordon Ross <[email protected]>
References:
https://www.illumos.org/issues/5946
https://www.illumos.org/issues/5945
https://github.com/illumos/illumos-gate/commit/24218be
Ported-by: Andriy Gapon <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3552
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/dmu_send.c | 4 | ||||
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c index 340926785..b2d844eb4 100644 --- a/module/zfs/dmu_send.c +++ b/module/zfs/dmu_send.c @@ -882,6 +882,10 @@ dmu_send_estimate(dsl_dataset_t *ds, dsl_dataset_t *fromds, uint64_t *sizep) if (!ds->ds_is_snapshot) return (SET_ERROR(EINVAL)); + /* fromsnap, if provided, must be a snapshot */ + if (fromds != NULL && !fromds->ds_is_snapshot) + return (SET_ERROR(EINVAL)); + /* * fromsnap must be an earlier snapshot from the same fs as tosnap, * or the origin's fs. diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 0eef257f1..c44927036 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -5171,11 +5171,19 @@ zfs_ioc_space_snaps(const char *lastsnap, nvlist_t *innvl, nvlist_t *outnvl) return (error); error = dsl_dataset_hold(dp, lastsnap, FTAG, &new); + if (error == 0 && !new->ds_is_snapshot) { + dsl_dataset_rele(new, FTAG); + error = SET_ERROR(EINVAL); + } if (error != 0) { dsl_pool_rele(dp, FTAG); return (error); } error = dsl_dataset_hold(dp, firstsnap, FTAG, &old); + if (error == 0 && !old->ds_is_snapshot) { + dsl_dataset_rele(old, FTAG); + error = SET_ERROR(EINVAL); + } if (error != 0) { dsl_dataset_rele(new, FTAG); dsl_pool_rele(dp, FTAG); |