d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libzfs: zpool_load_compat(): don't free undefined pointers

Browse Source 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #11993
This commit is contained in:
наб 2021-04-30 20:49:39 +02:00 committed by Brian Behlendorf
parent 8bc357ba92
commit 68ebbd9a93
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libzutil/os/linux/zutil_device_path_os.c
View File

@ -306,9 +306,10 @@ dm_get_underlying_path(const char *dm_name)
else
dev_str = tmp;
size = asprintf(&tmp, "/sys/block/%s/slaves/", dev_str);
if (size == -1 || !tmp)
if ((size = asprintf(&tmp, "/sys/block/%s/slaves/", dev_str)) == -1) {
tmp = NULL;
goto end;
}
dp = opendir(tmp);
if (dp == NULL)
@ -334,7 +335,9 @@ dm_get_underlying_path(const char *dm_name)
if (!enclosure_path)
continue;
size = asprintf(&path, "/dev/%s", ep->d_name);
if ((size = asprintf(
&path, "/dev/%s", ep->d_name)) == -1)
path = NULL;
free(enclosure_path);
break;
}
@ -352,7 +355,8 @@ dm_get_underlying_path(const char *dm_name)
* enclosure devices. Throw up out hands and return the first
* underlying path.
*/
size = asprintf(&path, "/dev/%s", first_path);
if ((size = asprintf(&path, "/dev/%s", first_path)) == -1)
path = NULL;
}
free(first_path);