summaryrefslogtreecommitdiffstats
path: root/cddl/usr.sbin
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2016-10-12 05:15:09 +0000
committermav <mav@FreeBSD.org>2016-10-12 05:15:09 +0000
commitc63a80428d27ada2807893286912e5c887019c66 (patch)
treedcef8b0fedb57f1d5c97ad74633efb10ff830da0 /cddl/usr.sbin
parent6cff35eca653c8c09f9cb679e7810dfbe6020574 (diff)
downloadFreeBSD-src-c63a80428d27ada2807893286912e5c887019c66.zip
FreeBSD-src-c63a80428d27ada2807893286912e5c887019c66.tar.gz
MFC r305209: MFV r302660: 6314 buffer overflow in dsl_dataset_name
illumos/illumos-gate@9adfa60d484ce2435f5af77cc99dcd4e692b6660 https://github.com/illumos/illumos-gate/commit/9adfa60d484ce2435f5af77cc99dcd4e6 92b6660 https://www.illumos.org/issues/6314 Callers of dsl_dataset_name pass a buffer of size ZFS_MAXNAMELEN, but dsl_dataset_name copies the datasets' name PLUS the snapshot name to it, resulting in a max of 2 * ZFS_MAXNAMELEN + '@'. Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com> Approved by: Dan McDonald <danmcd@omniti.com> Author: Matthew Ahrens <mahrens@delphix.com>
Diffstat (limited to 'cddl/usr.sbin')
-rw-r--r--cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc
index e1b3b1e..d6529507 100644
--- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc
+++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc
@@ -82,7 +82,7 @@ struct zpool_handle
{
libzfs_handle_t *zpool_hdl;
zpool_handle_t *zpool_next;
- char zpool_name[ZPOOL_MAXNAMELEN];
+ char zpool_name[ZFS_MAX_DATASET_NAME_LEN];
int zpool_state;
size_t zpool_config_size;
nvlist_t *zpool_config;
OpenPOWER on IntegriCloud