From 825d8e1b0f17e7e42fac1b7611ec99d0e737bd4e Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 18 Mar 2021 00:55:18 -0400 Subject: [PATCH] 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 Reviewed-by: Alexander Motin Signed-off-by: Ryan Moeller Closes #11767 --- module/os/freebsd/spl/spl_kstat.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/module/os/freebsd/spl/spl_kstat.c b/module/os/freebsd/spl/spl_kstat.c index 6bdef466c..43ce35829 100644 --- a/module/os/freebsd/spl/spl_kstat.c +++ b/module/os/freebsd/spl/spl_kstat.c @@ -299,15 +299,10 @@ __kstat_create(const char *module, int instance, const char *name, 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; - } else { + else 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 @@ -509,6 +504,8 @@ kstat_delete(kstat_t *ksp) sysctl_ctx_free(&ksp->ks_sysctl_ctx); ksp->ks_lock = NULL; 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); }