system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stand/zfs: Fix memory leaking on error cases

Browse source 
Now that we return an allocated zfs_devdesc, we have to free it. These
frees were missing from the error cases. In addition, simplify the code
a bit for the out of memory case.

Sponsored by:		Netflix
Reviewed by:		kevans
Differential Revision:	https://reviews.freebsd.org/D38006
This commit is contained in:
Warner Losh 2023-01-13 14:20:00 -07:00
parent 5740057b43
commit 5385c7e13b
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
stand/libsa/zfs/zfs.c
View file

@ -379,9 +379,9 @@ zfs_readdir(struct open_file *f, struct dirent *d)
static int
zfs_mount(const char *dev, const char *path, void **data)
{
struct zfs_devdesc *zfsdev;
struct zfs_devdesc *zfsdev = NULL;
spa_t *spa;
struct zfsmount *mnt;
struct zfsmount *mnt = NULL;
int rv;
errno = 0;
@ -391,36 +391,46 @@ zfs_mount(const char *dev, const char *path, void **data)
}
spa = spa_find_by_dev(zfsdev);
if (spa == NULL)
return (ENXIO);
if (spa == NULL) {
rv = ENXIO;
goto err;
}
mnt = calloc(1, sizeof(*mnt));
if (mnt != NULL && path != NULL)
if (mnt == NULL) {
rv = ENOMEM;
goto err;
}
if (mnt->path != NULL) {
mnt->path = strdup(path);
rv = errno;
if (mnt->path == NULL) {
rv = ENOMEM;
goto err;
}
}
if (mnt != NULL)
rv = zfs_mount_impl(spa, zfsdev->root_guid, mnt);
free(zfsdev);
rv = zfs_mount_impl(spa, zfsdev->root_guid, mnt);
if (rv == 0 && mnt != NULL && mnt->objset.os_type != DMU_OST_ZFS) {
if (rv == 0 && mnt->objset.os_type != DMU_OST_ZFS) {
printf("Unexpected object set type %ju\n",
(uintmax_t)mnt->objset.os_type);
rv = EIO;
}
err:
if (rv != 0) {
if (mnt != NULL)
free(mnt->path);
free(mnt);
free(zfsdev);
return (rv);
}
if (mnt != NULL) {
*data = mnt;
if (path != NULL)
STAILQ_INSERT_TAIL(&zfsmount, mnt, next);
}
*data = mnt;
if (path != NULL)
STAILQ_INSERT_TAIL(&zfsmount, mnt, next);
free(zfsdev);
return (rv);
}