From: Jens Axboe <axboe@fb.com>
Date: Thu, 16 Apr 2015 03:47:47 +0000 (-0600)
Subject: Fix wrong index bug
X-Git-Tag: fio-2.2.8~36
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4da24b69599f7f78dc1420345f91d90ec0cfe109;p=fio.git

Fix wrong index bug

Commit 0e4dd95c548cc re-uses 'i' as an iterator, causing us to
overrun the nr_ts allocated. This subsequently causes fio to
segfault.

Fixes: 0e4dd95c548cc
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/stat.c b/stat.c
index 34e3792f..e42edc91 100644
--- a/stat.c
+++ b/stat.c
@@ -1369,7 +1369,7 @@ void __show_run_stats(void)
 	struct group_run_stats *runstats, *rs;
 	struct thread_data *td;
 	struct thread_stat *threadstats, *ts;
-	int i, j, nr_ts, last_ts, idx;
+	int i, j, k, nr_ts, last_ts, idx;
 	int kb_base_warned = 0;
 	int unit_base_warned = 0;
 	struct json_object *root = NULL;
@@ -1481,8 +1481,8 @@ void __show_run_stats(void)
 		ts->latency_window = td->o.latency_window;
 
 		ts->nr_block_infos = td->ts.nr_block_infos;
-		for (i = 0; i < ts->nr_block_infos; i++)
-			ts->block_infos[i] = td->ts.block_infos[i];
+		for (k = 0; k < ts->nr_block_infos; k++)
+			ts->block_infos[k] = td->ts.block_infos[k];
 
 		sum_thread_stats(ts, &td->ts, idx);
 	}