From: Florian Forster <octo@collectd.org>
Date: Fri, 17 Nov 2017 14:09:59 +0000 (+0100)
Subject: zfs_arc plugin: Allocate ksp later to avoid memory leak.
X-Git-Tag: collectd-5.8.0~6^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=446184cb9cf0b21d3e387d426f2249d4a8aa0557;p=collectd.git

zfs_arc plugin: Allocate ksp later to avoid memory leak.

CID: 42796
---

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index e589184c..5d37f9f1 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -208,26 +208,21 @@ static int za_read(void) {
     return -1;
   }
 
-  ksp = llist_create();
-  if (ksp == NULL) {
-    ERROR("zfs_arc plugin: `llist_create' failed.");
-    fclose(fh);
-    return -1;
-  }
-
-  // Ignore the first two lines because they contain information about
-  // the rest of the file.
-  // See kstat_seq_show_headers module/spl/spl-kstat.c of the spl kernel
-  // module.
-  if (fgets(buffer, sizeof(buffer), fh) == NULL) {
-    ERROR("zfs_arc plugin: \"%s\" does not contain a single line.",
+  /* Ignore the first two lines because they contain information about the rest
+   * of the file.
+   * See kstat_seq_show_headers module/spl/spl-kstat.c of the spl kernel module.
+   */
+  if ((fgets(buffer, sizeof(buffer), fh) == NULL) ||
+      (fgets(buffer, sizeof(buffer), fh) == NULL)) {
+    ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.",
           ZOL_ARCSTATS_FILE);
     fclose(fh);
     return -1;
   }
-  if (fgets(buffer, sizeof(buffer), fh) == NULL) {
-    ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.",
-          ZOL_ARCSTATS_FILE);
+
+  ksp = llist_create();
+  if (ksp == NULL) {
+    ERROR("zfs_arc plugin: `llist_create' failed.");
     fclose(fh);
     return -1;
   }