diff options
| author | avg <avg@FreeBSD.org> | 2015-06-05 16:02:24 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2015-06-05 16:02:24 +0000 |
| commit | 8f2fc91d60ff78daf82d3b608c4bb5a50f20122a (patch) | |
| tree | a886c409d576de092d19d9bb1a8b37c7968d8be5 /sys/cddl | |
| parent | 535b577a78d1f94b987ff426bec0c8585fcd3da4 (diff) | |
| download | FreeBSD-src-8f2fc91d60ff78daf82d3b608c4bb5a50f20122a.zip FreeBSD-src-8f2fc91d60ff78daf82d3b608c4bb5a50f20122a.tar.gz | |
MFC r283524: dsl_dataset_promote_check: ensure that shared snaps do not
become too long
Diffstat (limited to 'sys/cddl')
| -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 58db4dd..7319c76 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); |
