From 3339867a862f63acdad71abd574d5d79e18d8579 Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Fri, 5 Sep 2014 09:04:58 -0800 Subject: [PATCH] 5116 zpool history -i goes into infinite loop Reviewed by: Christopher Siden Reviewed by: Dan Kimmel Reviewed by: George Wilson Reviewed by: Richard Elling Reviewed by: Boris Protopopov Approved by: Dan McDonald --- usr/src/lib/libzfs/common/libzfs_pool.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/usr/src/lib/libzfs/common/libzfs_pool.c b/usr/src/lib/libzfs/common/libzfs_pool.c index c26475e348..61ef78a663 100644 --- a/usr/src/lib/libzfs/common/libzfs_pool.c +++ b/usr/src/lib/libzfs/common/libzfs_pool.c @@ -3698,22 +3698,24 @@ zpool_history_unpack(char *buf, uint64_t bytes_read, uint64_t *leftover, return (0); } -#define HIS_BUF_LEN (128*1024) - /* * Retrieve the command history of a pool. */ int zpool_get_history(zpool_handle_t *zhp, nvlist_t **nvhisp) { - char buf[HIS_BUF_LEN]; + char *buf; + int buflen = 128 * 1024; uint64_t off = 0; nvlist_t **records = NULL; uint_t numrecords = 0; int err, i; + buf = malloc(buflen); + if (buf == NULL) + return (ENOMEM); do { - uint64_t bytes_read = sizeof (buf); + uint64_t bytes_read = buflen; uint64_t leftover; if ((err = get_history(zhp, buf, &off, &bytes_read)) != 0) @@ -3727,10 +3729,23 @@ zpool_get_history(zpool_handle_t *zhp, nvlist_t **nvhisp) &leftover, &records, &numrecords)) != 0) break; off -= leftover; + if (leftover == bytes_read) { + /* + * no progress made, because buffer is not big enough + * to hold this record; resize and retry. + */ + buflen *= 2; + free(buf); + buf = malloc(buflen); + if (buf == NULL) + return (ENOMEM); + } /* CONSTCOND */ } while (1); + free(buf); + if (!err) { verify(nvlist_alloc(nvhisp, NV_UNIQUE_NAME, 0) == 0); verify(nvlist_add_nvlist_array(*nvhisp, ZPOOL_HIST_RECORD, -- 2.11.4.GIT