From 9adfa60d484ce2435f5af77cc99dcd4e692b6660 Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Thu, 9 Jun 2016 10:38:27 -0400 Subject: 6314 buffer overflow in dsl_dataset_name Reviewed by: George Wilson Reviewed by: Prakash Surya Reviewed by: Igor Kozhukhov Approved by: Dan McDonald --- usr/src/cmd/halt/halt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'usr/src/cmd/halt') diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c index 36867c88dc..59f089e0b3 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -24,6 +24,7 @@ */ /* * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -719,7 +720,7 @@ validate_zfs_err_out: */ static int get_zfs_bootfs_arg(const char *arg, const char ** fpth, int *is_zfs, - char *bootfs_arg) + char *bootfs_arg) { zfs_handle_t *zhp = NULL; zpool_handle_t *zpoolp = NULL; @@ -727,8 +728,8 @@ get_zfs_bootfs_arg(const char *arg, const char ** fpth, int *is_zfs, struct mnttab mnt; char *poolname = NULL; char physpath[MAXPATHLEN]; - char mntsp[ZPOOL_MAXNAMELEN]; - char bootfs[ZPOOL_MAXNAMELEN]; + char mntsp[ZFS_MAX_DATASET_NAME_LEN]; + char bootfs[ZFS_MAX_DATASET_NAME_LEN]; int rc = 0; size_t mntlen = 0; size_t msz; -- cgit v1.2.3