From 50f6934b9c1f4aa583592e8a969b934440a44c64 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Sun, 12 Mar 2023 12:30:21 -0400 Subject: [PATCH] discover_cached_paths() should not corrupt nvlist string value discover_cached_paths() will write a NULL into a string from a nvlist to use it as a substring, but does not restore it before return. This corrupts the nvlist. It should be harmless unless the string is needed again later, but we should not do this, so let us fix it. Reviewed-by: Tino Reichardt Reviewed-by: Brian Behlendorf Signed-off-by: Richard Yao Closes #14612 --- lib/libzutil/zutil_import.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c index 5d7b4a946c..7c86054f05 100644 --- a/lib/libzutil/zutil_import.c +++ b/lib/libzutil/zutil_import.c @@ -1564,12 +1564,19 @@ discover_cached_paths(libpc_handle_t *hdl, nvlist_t *nv, * our directory cache. */ if (nvlist_lookup_string(nv, ZPOOL_CONFIG_PATH, &path) == 0) { - if ((dl = zfs_dirnamelen(path)) == -1) + int ret; + char c = '\0'; + if ((dl = zfs_dirnamelen(path)) == -1) { path = (char *)"."; - else + } else { + c = path[dl]; path[dl] = '\0'; - return (zpool_find_import_scan_dir(hdl, lock, cache, - path, 0)); + } + ret = zpool_find_import_scan_dir(hdl, lock, cache, + path, 0); + if (c != '\0') + path[dl] = c; + return (ret); } return (0); }