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/libbe/common/be_utils.c | |
| parent | 0c779ad424a92a84d1e07d47cab7f8009189202b (diff) | |
| download | illumos-gate-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/libbe/common/be_utils.c')
| -rw-r--r-- | usr/src/lib/libbe/common/be_utils.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/lib/libbe/common/be_utils.c b/usr/src/lib/libbe/common/be_utils.c index 4841302db3..b92c32e527 100644 --- a/usr/src/lib/libbe/common/be_utils.c +++ b/usr/src/lib/libbe/common/be_utils.c @@ -21,11 +21,9 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. - */ - -/* * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright 2015 Toomas Soome <tsoome@me.com> + * Copyright (c) 2015 by Delphix. All rights reserved. */ @@ -206,7 +204,7 @@ be_get_defaults(struct be_defaults *defaults) const char *res = defread_r(BE_DFLT_BENAME_STARTS, defp); if (res != NULL && res[0] != NULL) { (void) strlcpy(defaults->be_deflt_bename_starts_with, - res, ZFS_MAXNAMELEN); + res, ZFS_MAX_DATASET_NAME_LEN); defaults->be_deflt_rpool_container = B_TRUE; } defclose_r(defp); @@ -318,7 +316,7 @@ be_make_container_ds(const char *zpool, char *container_ds, char * be_make_name_from_ds(const char *dataset, char *rc_loc) { - char ds[ZFS_MAXNAMELEN]; + char ds[ZFS_MAX_DATASET_NAME_LEN]; char *tok = NULL; char *name = NULL; struct be_defaults be_defaults; |