diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2015-05-25 11:48:15 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2015-05-25 11:48:15 +0000 |
| commit | e80d8b4b7cc6f2413bda58c69f8f838129387675 (patch) | |
| tree | e115186e70b2ff55e23fcd2c4cb944eb6708be77 | |
| parent | 6e23c23b52a354cb34aa21b7d5b16ca14690c830 (diff) | |
| download | src-e80d8b4b7cc6f2413bda58c69f8f838129387675.tar.gz src-e80d8b4b7cc6f2413bda58c69f8f838129387675.zip | |
dsl_dataset_promote_check: ensure that shared snaps do not become too long
... after they are transfered from the old origin to the new one.
See: https://www.illumos.org/issues/5909
See: https://reviews.csiden.org/r/219/
Reviewed by: mahrens
MFC after: 10 days
Sponsored by: ClusterHQ
Notes
Notes:
svn path=/head/; revision=283524
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c index 58db4ddb71c2..7319c76e9f23 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c @@ -2161,12 +2161,14 @@ dsl_dataset_promote_check(void *arg, dmu_tx_t *tx) int err; uint64_t unused; uint64_t ss_mv_cnt; + size_t max_snap_len; err = promote_hold(ddpa, dp, FTAG); if (err != 0) return (err); hds = ddpa->ddpa_clone; + max_snap_len = MAXNAMELEN - strlen(ddpa->ddpa_clonename) - 1; if (dsl_dataset_phys(hds)->ds_flags & DS_FLAG_NOPROMOTE) { promote_rele(ddpa, FTAG); @@ -2230,6 +2232,10 @@ dsl_dataset_promote_check(void *arg, dmu_tx_t *tx) /* Check that the snapshot name does not conflict */ VERIFY0(dsl_dataset_get_snapname(ds)); + if (strlen(ds->ds_snapname) >= max_snap_len) { + err = SET_ERROR(ENAMETOOLONG); + goto out; + } err = dsl_dataset_snap_lookup(hds, ds->ds_snapname, &val); if (err == 0) { (void) strcpy(ddpa->err_ds, snap->ds->ds_snapname); |