Correct two libmemstat(3) bugs:

- Move memory_type_list flushing logic from memstat_mtl_free() to
  _memstat_mtl_empty(), a libmemstat-internal function that can
  be called from other parts of the library.  Invoke
  _memstat_mtl_empty() from memstat_mtl_free(), which also frees
  the containing list structure.

  Invoke _memstat_mtl_empty() instead of memstat_mtl_free() in
  various error cases in memstat_malloc.c and memstat_uma.c, which
  previously resulted in the list being freed prematurely.

- Reverse the order of updating the mt_kegfree and mt_free fields
  of the memory_type in memstat_uma.c, otherwise keg free items
  won't be counted properly for non-secondary zones.

MFC after:	3 days

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/libmemstat/memstat.c b/lib/libmemstat/memstat.c
index f32541f..de8ae65 100644
--- a/lib/libmemstat/memstat.c
+++ b/lib/libmemstat/memstat.c
@@ -88,7 +88,7 @@ memstat_mtl_next(struct memory_type *mtp)
 }
 
 void
-memstat_mtl_free(struct memory_type_list *list)
+_memstat_mtl_empty(struct memory_type_list *list)
 {
 	struct memory_type *mtp;
 
@@ -96,6 +96,13 @@ memstat_mtl_free(struct memory_type_list *list)
 		LIST_REMOVE(mtp, mt_list);
 		free(mtp);
 	}
+}
+
+void
+memstat_mtl_free(struct memory_type_list *list)
+{
+
+	_memstat_mtl_empty(list);
 	free(list);
 }