diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2016-06-09 10:38:27 -0400 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2016-06-09 15:55:53 -0400 |
| commit | 9adfa60d484ce2435f5af77cc99dcd4e692b6660 (patch) | |
| tree | 8317e936fc768f79567bf498076c3fbab777adc6 /usr/src/lib/libzfs_jni | |
| parent | 0c779ad424a92a84d1e07d47cab7f8009189202b (diff) | |
| download | illumos-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_jni')
| -rw-r--r-- | usr/src/lib/libzfs_jni/common/libzfs_jni_dataset.c | 6 | ||||
| -rw-r--r-- | usr/src/lib/libzfs_jni/common/libzfs_jni_property.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/usr/src/lib/libzfs_jni/common/libzfs_jni_dataset.c b/usr/src/lib/libzfs_jni/common/libzfs_jni_dataset.c index 573daf940d..2aa11ba23b 100644 --- a/usr/src/lib/libzfs_jni/common/libzfs_jni_dataset.c +++ b/usr/src/lib/libzfs_jni/common/libzfs_jni_dataset.c @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2015 by Delphix. All rights reserved. + */ #include "libzfs_jni_util.h" #include "libzfs_jni_dataset.h" @@ -568,7 +570,7 @@ create_DatasetBean(JNIEnv *env, zfs_handle_t *zhp) static int is_fs_snapshot(zfs_handle_t *zhp) { - char parent[ZFS_MAXNAMELEN]; + char parent[ZFS_MAX_DATASET_NAME_LEN]; zfs_handle_t *parent_zhp; int isfs; diff --git a/usr/src/lib/libzfs_jni/common/libzfs_jni_property.c b/usr/src/lib/libzfs_jni/common/libzfs_jni_property.c index 1b78bb50b4..8dbd9382c7 100644 --- a/usr/src/lib/libzfs_jni/common/libzfs_jni_property.c +++ b/usr/src/lib/libzfs_jni/common/libzfs_jni_property.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. */ #include "libzfs_jni_property.h" @@ -168,7 +169,7 @@ create_BasicProperty(JNIEnv *env, zfs_handle_t *zhp, zfs_prop_t prop, char *propClass, char *valueClass) { jobject propertyObject = NULL; - char source[ZFS_MAXNAMELEN]; + char source[ZFS_MAX_DATASET_NAME_LEN]; zprop_source_t srctype; jobject propValue = NULL; @@ -261,7 +262,7 @@ create_ObjectProperty(JNIEnv *env, zfs_handle_t *zhp, zfs_prop_t prop, char *propClass, char *valueClass) { jobject propertyObject = NULL; - char source[ZFS_MAXNAMELEN]; + char source[ZFS_MAX_DATASET_NAME_LEN]; zprop_source_t srctype; jobject propValue = NULL; |