Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

FreeBSD: Fix memory leaks in kstats 

Don't handle (incorrectly) kmem_zalloc() failure.  With KM_SLEEP,
will never return NULL.

Free the data allocated for non-virtual kstats when deleting the object.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #11767
This commit is contained in:
Ryan Moeller 2021-03-18 00:55:18 -04:00 committed by Tony Hutter
parent f7797f3f5e
commit 825d8e1b0f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module/os/freebsd/spl/spl_kstat.c
View File

@ -299,15 +299,10 @@ __kstat_create(const char *module, int instance, const char *name,
panic("Undefined kstat type %d\n", ksp->ks_type); panic("Undefined kstat type %d\n", ksp->ks_type);
} }
if (ksp->ks_flags & KSTAT_FLAG_VIRTUAL) { if (ksp->ks_flags & KSTAT_FLAG_VIRTUAL)
ksp->ks_data = NULL; ksp->ks_data = NULL;
} else { else
ksp->ks_data = kmem_zalloc(ksp->ks_data_size, KM_SLEEP); ksp->ks_data = kmem_zalloc(ksp->ks_data_size, KM_SLEEP);
if (ksp->ks_data == NULL) {
kmem_free(ksp, sizeof (*ksp));
ksp = NULL;
}
}
/* /*
* Some kstats use a module name like "zfs/poolname" to distinguish a * Some kstats use a module name like "zfs/poolname" to distinguish a
@ -509,6 +504,8 @@ kstat_delete(kstat_t *ksp)
sysctl_ctx_free(&ksp->ks_sysctl_ctx); sysctl_ctx_free(&ksp->ks_sysctl_ctx);
ksp->ks_lock = NULL; ksp->ks_lock = NULL;
mutex_destroy(&ksp->ks_private_lock); mutex_destroy(&ksp->ks_private_lock);
if (!(ksp->ks_flags & KSTAT_FLAG_VIRTUAL))
kmem_free(ksp->ks_data, ksp->ks_data_size);
free(ksp, M_KSTAT); free(ksp, M_KSTAT);
} }