diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2015-06-05 17:08:32 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2015-06-05 17:08:32 +0000 |
| commit | 105c70db4298a243d1982b3878514220027094f2 (patch) | |
| tree | 2a4dee88f90ea6062e5a340fc227d76505540419 | |
| parent | bfba7fc64332a6d2101823063df13649588ddaf6 (diff) | |
| download | src-105c70db4298a243d1982b3878514220027094f2.tar.gz src-105c70db4298a243d1982b3878514220027094f2.zip | |
5909 ensure that shared snap names don't become too long after promotion
Author: Andriy Gapon <avg@freebsd.org>
Reviewed by: George Wilson <george@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
illumos/illumos-gate@cb5842f8b0caaad0ed53535bd77042e933fdbafe
Notes
Notes:
svn path=/vendor-sys/illumos/dist/; revision=284039
| -rw-r--r-- | uts/common/fs/zfs/dsl_dataset.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/uts/common/fs/zfs/dsl_dataset.c b/uts/common/fs/zfs/dsl_dataset.c index ec2d022aed39..5a9acd2f0bb6 100644 --- a/uts/common/fs/zfs/dsl_dataset.c +++ b/uts/common/fs/zfs/dsl_dataset.c @@ -2081,12 +2081,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); @@ -2150,6 +2152,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); |