summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/libzfs_diff.c
diff options
context:
space:
mode:
authorMatthew Ahrens <mahrens@delphix.com>2016-06-09 10:38:27 -0400
committerMatthew Ahrens <mahrens@delphix.com>2016-06-09 15:55:53 -0400
commit9adfa60d484ce2435f5af77cc99dcd4e692b6660 (patch)
tree8317e936fc768f79567bf498076c3fbab777adc6 /usr/src/lib/libzfs/common/libzfs_diff.c
parent0c779ad424a92a84d1e07d47cab7f8009189202b (diff)
downloadillumos-joyent-9adfa60d484ce2435f5af77cc99dcd4e692b6660.tar.gz
6314 buffer overflow in dsl_dataset_name
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>
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_diff.c')
-rw-r--r--usr/src/lib/libzfs/common/libzfs_diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_diff.c b/usr/src/lib/libzfs/common/libzfs_diff.c
index d58558ffa3..d6cf32714d 100644
--- a/usr/src/lib/libzfs/common/libzfs_diff.c
+++ b/usr/src/lib/libzfs/common/libzfs_diff.c
@@ -22,6 +22,7 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
* Copyright 2016 Joyent, Inc.
* Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>
*/
@@ -601,7 +602,7 @@ get_snapshot_names(differ_info_t *di, const char *fromsnap,
* not the same dataset name, might be okay if
* tosnap is a clone of a fromsnap descendant.
*/
- char origin[ZFS_MAXNAMELEN];
+ char origin[ZFS_MAX_DATASET_NAME_LEN];
zprop_source_t src;
zfs_handle_t *zhp;