From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 6 Mar 2014 23:33:04 +0000 (+1100)
Subject: xfs_repair: fix array overrun in do_inode_prefetch
X-Git-Tag: v3.2.0-rc1~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97b1fcfd16157e2b8dba59f5f90f4aaa9704044b;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: fix array overrun in do_inode_prefetch

Coverity spotted this:

do_inode_prefetch() does a while loop, creating queues:

        for (i = 0; i < thread_count; i++) {
		...
		create_work_queue(&queues[i], mp, 1);
		...
	}

and then does this to wait for them all to complete:

	for (; i >= 0; i--)
		destroy_work_queue(&queues[i]);

But we leave the first for loop with (i == thread_coun)t, and
the second one will try to index queues[] one past the end.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/repair/prefetch.c b/repair/prefetch.c
index 0f9e3fe50..e47a48e39 100644
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -995,7 +995,7 @@ do_inode_prefetch(
 	/*
 	 * wait for workers to complete
 	 */
-	for (; i >= 0; i--)
+	while (i--)
 		destroy_work_queue(&queues[i]);
 	free(queues);
 }