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 9aa1fa15acab9ed27d0925e2926816bd8478d90e..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;
                }