Fix memory/fd leak in check_file() and is_spare()

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: liuhuang <liu.huang@zte.com.cn>
Closes #5085

diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index 7ad44a948c43116dfce0db7e3c761df10e0eff8e..7d114889f5f97e7a35cd49c6f9e8270902f958d2 100644 (file)
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -334,8 +334,11 @@ check_file(const char *file, boolean_t force, boolean_t isspare)
                /*
                 * Allow hot spares to be shared between pools.
                 */
-               if (state == POOL_STATE_SPARE && isspare)
+               if (state == POOL_STATE_SPARE && isspare) {
+                       free(name);
+                       (void) close(fd);
                        return (0);
+               }
 
                if (state == POOL_STATE_ACTIVE ||
                    state == POOL_STATE_SPARE || !force) {
@@ -583,8 +586,10 @@ is_spare(nvlist_t *config, const char *path)
        free(name);
        (void) close(fd);
 
-       if (config == NULL)
+       if (config == NULL) {
+               nvlist_free(label);
                return (B_TRUE);
+       }
 
        verify(nvlist_lookup_uint64(label, ZPOOL_CONFIG_GUID, &guid) == 0);
        nvlist_free(label);