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/cmd/ndmpd/tlm/tlm_lib.c | |
| 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/cmd/ndmpd/tlm/tlm_lib.c')
| -rw-r--r-- | usr/src/cmd/ndmpd/tlm/tlm_lib.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr/src/cmd/ndmpd/tlm/tlm_lib.c b/usr/src/cmd/ndmpd/tlm/tlm_lib.c index fa15a8e7ad..666ea3feca 100644 --- a/usr/src/cmd/ndmpd/tlm/tlm_lib.c +++ b/usr/src/cmd/ndmpd/tlm/tlm_lib.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. */ /* @@ -723,10 +724,10 @@ tlm_build_snapshot_name(char *name, char *sname, char *jname) { zfs_handle_t *zhp; char *rest; - char volname[ZFS_MAXNAMELEN]; + char volname[ZFS_MAX_DATASET_NAME_LEN]; char mountpoint[PATH_MAX]; - if (get_zfsvolname(volname, ZFS_MAXNAMELEN, name) == -1) + if (get_zfsvolname(volname, ZFS_MAX_DATASET_NAME_LEN, name) == -1) goto notzfs; (void) mutex_lock(&zlib_mtx); @@ -1271,7 +1272,7 @@ boolean_t fs_is_chkpntvol(char *path) { zfs_handle_t *zhp; - char vol[ZFS_MAXNAMELEN]; + char vol[ZFS_MAX_DATASET_NAME_LEN]; if (!path || !*path) return (FALSE); @@ -1303,7 +1304,7 @@ boolean_t fs_is_chkpnt_enabled(char *path) { zfs_handle_t *zhp; - char vol[ZFS_MAXNAMELEN]; + char vol[ZFS_MAX_DATASET_NAME_LEN]; if (!path || !*path) return (FALSE); @@ -1337,15 +1338,13 @@ fs_is_rdonly(char *path) * Min/max functions */ unsigned -min(a, b) - unsigned a, b; +min(unsigned a, unsigned b) { return (a < b ? a : b); } unsigned -max(a, b) - unsigned a, b; +max(unsigned a, unsigned b) { return (a > b ? a : b); } |