Fix leak of directory handle in find_add_disk_slaves() error case

[fio.git] / diskutil.c

diff --git a/diskutil.c b/diskutil.c
index 3681dde5d8cedb8190e4dcbd61f60274bba76179..5170915c91d5309eeae539b2cc32e9531c7c16d4 100644 (file)
--- a/diskutil.c
+++ b/diskutil.c
@@ -236,9 +236,10 @@ static void find_add_disk_slaves(struct thread_data *td, char *path,
                 * are links to the real directories for the slave
                 * devices?
                 */
-               linklen = readlink(temppath, slavepath, PATH_MAX - 0);
+               linklen = readlink(temppath, slavepath, PATH_MAX - 1);
                if (linklen  < 0) {
                        perror("readlink() for slave device.");
+                       closedir(dirhandle);
                        return;
                }
                slavepath[linklen] = '\0';
@@ -246,6 +247,7 @@ static void find_add_disk_slaves(struct thread_data *td, char *path,
                sprintf(temppath, "%s/%s/dev", slavesdir, slavepath);
                if (read_block_dev_entry(temppath, &majdev, &mindev)) {
                        perror("Error getting slave device numbers.");
+                       closedir(dirhandle);
                        return;
                }
 
@@ -281,6 +283,11 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
        dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path);
 
        du = smalloc(sizeof(*du));
+       if (!du) {
+               log_err("fio: smalloc() pool exhausted\n");
+               return NULL;
+       }
+
        memset(du, 0, sizeof(*du));
        INIT_FLIST_HEAD(&du->list);
        l = snprintf(du->path, sizeof(du->path), "%s/stat", path);
@@ -600,21 +607,19 @@ void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
                log_info("\n");
 }
 
-static void print_disk_util_json(struct disk_util *du, struct json_array *array)
+void json_array_add_disk_util(struct disk_util_stat *dus,
+               struct disk_util_agg *agg, struct json_array *array)
 {
-       double util = 0;
-       struct disk_util_stat *dus = &du->dus;
-       struct disk_util_agg *agg = &du->agg;
        struct json_object *obj;
-
-       obj = json_create_object();
-       json_array_add_value_object(array, obj);
+       double util = 0;
 
        if (dus->msec)
                util = (double) 100 * dus->io_ticks / (double) dus->msec;
        if (util > 100.0)
                util = 100.0;
 
+       obj = json_create_object();
+       json_array_add_value_object(array, obj);
 
        json_object_add_value_string(obj, "name", dus->name);
        json_object_add_value_int(obj, "read_ios", dus->ios[0]);
@@ -649,11 +654,27 @@ static void print_disk_util_json(struct disk_util *du, struct json_array *array)
        json_object_add_value_float(obj, "aggr_util", agg->max_util.u.f);
 }
 
+static void json_object_add_disk_utils(struct json_object *obj,
+                                      struct flist_head *head)
+{
+       struct json_array *array = json_create_array();
+       struct flist_head *entry;
+       struct disk_util *du;
+
+       json_object_add_value_array(obj, "disk_util", array);
+
+       flist_for_each(entry, head) {
+               du = flist_entry(entry, struct disk_util, list);
+
+               aggregate_slaves_stats(du);
+               json_array_add_disk_util(&du->dus, &du->agg, array);
+       }
+}
+
 void show_disk_util(int terse, struct json_object *parent)
 {
        struct flist_head *entry;
        struct disk_util *du;
-       struct json_array *array = NULL;
 
        fio_mutex_down(disk_util_mutex);
 
@@ -662,23 +683,18 @@ void show_disk_util(int terse, struct json_object *parent)
                return;
        }
 
-       if (!terse)
+       if (!terse && !parent)
                log_info("\nDisk stats (read/write):\n");
 
        if (output_format == FIO_OUTPUT_JSON) {
-               array = json_create_array();
-               json_object_add_value_array(parent, "disk_util", array);
-       }
-
-       flist_for_each(entry, &disk_list) {
-               du = flist_entry(entry, struct disk_util, list);
+               json_object_add_disk_utils(parent, &disk_list);
+       } else
+               flist_for_each(entry, &disk_list) {
+                       du = flist_entry(entry, struct disk_util, list);
 
-               aggregate_slaves_stats(du);
-               if (output_format == FIO_OUTPUT_JSON)
-                       print_disk_util_json(du, array);
-               else
+                       aggregate_slaves_stats(du);
                        print_disk_util(&du->dus, &du->agg, terse);
-       }
+               }
 
        fio_mutex_up(disk_util_mutex);
 }