diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2022-08-11 14:18:13 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2022-08-11 14:18:13 +0000 |
| commit | 78d7704b7c0d36a476e2c998a8510eb98e024753 (patch) | |
| tree | 5c36ae7fe4b51c9a24a7d2f5912618afc1c05953 | |
| parent | e225983737b42c7dd732ffed2de194e0bd2a3378 (diff) | |
| download | src-78d7704b7c0d36a476e2c998a8510eb98e024753.tar.gz src-78d7704b7c0d36a476e2c998a8510eb98e024753.zip | |
makefs: Fix a memory leak in fs_layout_one()
Check the canmount property before building the mountpoint string.
Reported by: Coverity
Fixes: 240afd8c1fcc ("makefs: Add ZFS support")
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | usr.sbin/makefs/zfs/fs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c index 15025ec5447d..2907a6b05f81 100644 --- a/usr.sbin/makefs/zfs/fs.c +++ b/usr.sbin/makefs/zfs/fs.c @@ -714,11 +714,11 @@ fs_layout_one(zfs_opt_t *zfs, zfs_dsl_dir_t *dsldir, void *arg) if (!dsl_dir_has_dataset(dsldir)) return; + if (dsl_dir_get_canmount(dsldir, &canmount) == 0 && canmount == 0) + return; mountpoint = dsl_dir_get_mountpoint(zfs, dsldir); if (mountpoint == NULL) return; - if (dsl_dir_get_canmount(dsldir, &canmount) == 0 && canmount == 0) - return; /* * If we were asked to specify a bootfs, set it here. |