From: Jens Axboe <axboe@suse.de>
Date: Wed, 25 Jan 2006 23:27:28 +0000 (-0800)
Subject: [PATCH] blkparse: make sure new pci infos have ->fd initialized to -1
X-Git-Tag: blktrace-0.99.1~115
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=cb7b061dee71a4a1987f22a356bdf8f69bebd000;p=blktrace.git

[PATCH] blkparse: make sure new pci infos have ->fd initialized to -1

This avoids hangs in blktrace when seeing potentially invalid samples, since
it will attempt to read from fd == 0 (stdin) in that case.
---

diff --git a/blkparse.c b/blkparse.c
index e4804bc..cf43370 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -810,6 +810,7 @@ static void resize_cpu_info(struct per_dev_info *pdi, int cpu)
 	int ncpus = pdi->ncpus;
 	int new_count = cpu + 1;
 	int new_space, size;
+	int i;
 	char *new_start;
 
 	size = new_count * sizeof(struct per_cpu_info);
@@ -827,6 +828,9 @@ static void resize_cpu_info(struct per_dev_info *pdi, int cpu)
 
 	pdi->ncpus = new_count;
 	pdi->cpus = cpus;
+
+	for (i = cpu; i < new_count; i++)
+		pdi->cpus[i].fd = -1;
 }
 
 static struct per_cpu_info *get_cpu_info(struct per_dev_info *pdi, int cpu)