From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNSQp-0001x4-8s for qemu-devel@nongnu.org; Mon, 07 Nov 2011 11:52:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNSQh-0004o2-9O for qemu-devel@nongnu.org; Mon, 07 Nov 2011 11:52:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNSQh-0004nm-11 for qemu-devel@nongnu.org; Mon, 07 Nov 2011 11:52:15 -0500 From: Kevin Wolf Date: Mon, 7 Nov 2011 17:55:09 +0100 Message-Id: <1320684918-6483-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1320684918-6483-1-git-send-email-kwolf@redhat.com> References: <1320684918-6483-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 02/11] qemu-io: Fix multiwrite_f error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org Without this fix, some qiovs can be leaked if an error occurs. Also a semicolon at the end of the command line would make the code walk beyond the end of argv. Signed-off-by: Kevin Wolf --- qemu-io.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 1c49d44..de26422 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -960,21 +960,21 @@ static int multiwrite_f(int argc, char **argv) buf = g_malloc0(nr_reqs * sizeof(*buf)); qiovs = g_malloc(nr_reqs * sizeof(*qiovs)); - for (i = 0; i < nr_reqs; i++) { + for (i = 0; i < nr_reqs && optind < argc; i++) { int j; /* Read the offset of the request */ offset = cvtnum(argv[optind]); if (offset < 0) { printf("non-numeric offset argument -- %s\n", argv[optind]); - return 0; + goto out; } optind++; if (offset & 0x1ff) { printf("offset %lld is not sector aligned\n", (long long)offset); - return 0; + goto out; } if (i == 0) { @@ -1005,6 +1005,9 @@ static int multiwrite_f(int argc, char **argv) pattern++; } + /* If there were empty requests at the end, ignore them */ + nr_reqs = i; + gettimeofday(&t1, NULL); cnt = do_aio_multiwrite(reqs, nr_reqs, &total); gettimeofday(&t2, NULL); -- 1.7.6.4