From a367d6bab04cc7d3c7b63659ad5f73b323765020 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 16 Mar 2011 13:52:34 -0300 Subject: [PATCH 04/11] Add proper -errno error return values to qcow2_open() RH-Author: Kevin Wolf Message-id: <1300283560-13085-3-git-send-email-kwolf@redhat.com> Patchwork-id: 20131 O-Subject: [RHEL-6.1 qemu-kvm PATCH 2/8] Add proper -errno error return values to qcow2_open() Bugzilla: 688119 RH-Acked-by: Juan Quintela RH-Acked-by: Markus Armbruster RH-Acked-by: Jes Sorensen From: Jes Sorensen Bugzilla: 688119 In addition this adds missing braces to the function to be consistent with the coding style. Signed-off-by: Jes Sorensen Signed-off-by: Kevin Wolf (cherry picked from commit 6d85a57e20825e72895c31eb69080df8d476edb2) --- block/qcow2.c | 60 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 42 insertions(+), 18 deletions(-) Signed-off-by: Luiz Capitulino --- block/qcow2.c | 60 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 42 insertions(+), 18 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 4fcb002..423e24a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -140,13 +140,15 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, static int qcow2_open(BlockDriverState *bs, int flags) { BDRVQcowState *s = bs->opaque; - int len, i; + int len, i, ret = 0; QCowHeader header; uint64_t ext_end; bool writethrough; - if (bdrv_pread(bs->file, 0, &header, sizeof(header)) != sizeof(header)) + ret = bdrv_pread(bs->file, 0, &header, sizeof(header)); + if (ret < 0) { goto fail; + } be32_to_cpus(&header.magic); be32_to_cpus(&header.version); be64_to_cpus(&header.backing_file_offset); @@ -161,16 +163,23 @@ static int qcow2_open(BlockDriverState *bs, int flags) be64_to_cpus(&header.snapshots_offset); be32_to_cpus(&header.nb_snapshots); - if (header.magic != QCOW_MAGIC || header.version != QCOW_VERSION) + if (header.magic != QCOW_MAGIC || header.version != QCOW_VERSION) { + ret = -EINVAL; goto fail; + } if (header.cluster_bits < MIN_CLUSTER_BITS || - header.cluster_bits > MAX_CLUSTER_BITS) + header.cluster_bits > MAX_CLUSTER_BITS) { + ret = -EINVAL; goto fail; - if (header.crypt_method > QCOW_CRYPT_AES) + } + if (header.crypt_method > QCOW_CRYPT_AES) { + ret = -EINVAL; goto fail; + } s->crypt_method_header = header.crypt_method; - if (s->crypt_method_header) + if (s->crypt_method_header) { bs->encrypted = 1; + } s->cluster_bits = header.cluster_bits; s->cluster_size = 1 << s->cluster_bits; s->cluster_sectors = 1 << (s->cluster_bits - 9); @@ -192,15 +201,19 @@ static int qcow2_open(BlockDriverState *bs, int flags) s->l1_vm_state_index = size_to_l1(s, header.size); /* the L1 table must contain at least enough entries to put header.size bytes */ - if (s->l1_size < s->l1_vm_state_index) + if (s->l1_size < s->l1_vm_state_index) { + ret = -EINVAL; goto fail; + } s->l1_table_offset = header.l1_table_offset; if (s->l1_size > 0) { s->l1_table = qemu_mallocz( align_offset(s->l1_size * sizeof(uint64_t), 512)); - if (bdrv_pread(bs->file, s->l1_table_offset, s->l1_table, s->l1_size * sizeof(uint64_t)) != - s->l1_size * sizeof(uint64_t)) + ret = bdrv_pread(bs->file, s->l1_table_offset, s->l1_table, + s->l1_size * sizeof(uint64_t)); + if (ret < 0) { goto fail; + } for(i = 0;i < s->l1_size; i++) { be64_to_cpus(&s->l1_table[i]); } @@ -218,35 +231,46 @@ static int qcow2_open(BlockDriverState *bs, int flags) + 512); s->cluster_cache_offset = -1; - if (qcow2_refcount_init(bs) < 0) + ret = qcow2_refcount_init(bs); + if (ret != 0) { goto fail; + } QLIST_INIT(&s->cluster_allocs); /* read qcow2 extensions */ - if (header.backing_file_offset) + if (header.backing_file_offset) { ext_end = header.backing_file_offset; - else + } else { ext_end = s->cluster_size; - if (qcow2_read_extensions(bs, sizeof(header), ext_end)) + } + if (qcow2_read_extensions(bs, sizeof(header), ext_end)) { + ret = -EINVAL; goto fail; + } /* read the backing file name */ if (header.backing_file_offset != 0) { len = header.backing_file_size; - if (len > 1023) + if (len > 1023) { len = 1023; - if (bdrv_pread(bs->file, header.backing_file_offset, bs->backing_file, len) != len) + } + ret = bdrv_pread(bs->file, header.backing_file_offset, + bs->backing_file, len); + if (ret < 0) { goto fail; + } bs->backing_file[len] = '\0'; } - if (qcow2_read_snapshots(bs) < 0) + if (qcow2_read_snapshots(bs) < 0) { + ret = -EINVAL; goto fail; + } #ifdef DEBUG_ALLOC qcow2_check_refcounts(bs); #endif - return 0; + return ret; fail: qcow2_free_snapshots(bs); @@ -257,7 +281,7 @@ static int qcow2_open(BlockDriverState *bs, int flags) } qemu_free(s->cluster_cache); qemu_free(s->cluster_data); - return -1; + return ret; } static int qcow2_set_key(BlockDriverState *bs, const char *key) -- 1.7.4.1.230.gae447