Reopen of vdev_file would panic

Attempting to spa_strfree() of a NULL name. When we skip the open, we do not have the name assigned.
openzfsonwindows · Feb 22, 2023 · eed7d32 · eed7d32
1 parent 0d8d864
commit eed7d32
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/module/os/windows/zfs/vdev_file.c b/module/os/windows/zfs/vdev_file.c
@@ -184,7 +184,8 @@ vdev_file_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize,
 
 	if (error) {
 		vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
-		spa_strfree(vdev_path);
+		if (vdev_path != NULL)
+			spa_strfree(vdev_path);
 		return (error);
 	}
 
@@ -200,7 +201,8 @@ vdev_file_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize,
 		 */
 		// zfs_file_close(fp);
 		vdev_file_close(vd);
-		spa_strfree(vdev_path);
+		if (vdev_path != NULL)
+			spa_strfree(vdev_path);
 		return (SET_ERROR(ENODEV));
 	}
 
@@ -233,14 +235,16 @@ vdev_file_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize,
 
 	if (error) {
 		vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
-		spa_strfree(vdev_path);
+		if (vdev_path != NULL)
+			spa_strfree(vdev_path);
 		return (error);
 	}
 
 	*max_psize = *psize = zfa.zfa_size;
 	*ashift = SPA_MINBLOCKSHIFT;
 	*physical_ashift = SPA_MINBLOCKSHIFT;
-	spa_strfree(vdev_path);
+	if (vdev_path != NULL)
+		spa_strfree(vdev_path);
 	return (0);
 }