OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qcow2: Fix some more qemu_malloc fallout

Browse Source 
Oh joy...

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Kevin Wolf 2009-11-27 17:35:55 +01:00 committed by Anthony Liguori
parent e1c7f0e3f9
commit 702ef63f3e
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
block/qcow2-refcount.c
View File

@ -513,7 +513,11 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
l1_size2 = l1_size * sizeof(uint64_t); l1_size2 = l1_size * sizeof(uint64_t);
l1_allocated = 0; l1_allocated = 0;
if (l1_table_offset != s->l1_table_offset) { if (l1_table_offset != s->l1_table_offset) {
l1_table = qemu_mallocz(align_offset(l1_size2, 512)); if (l1_size2 != 0) {
l1_table = qemu_mallocz(align_offset(l1_size2, 512));
} else {
l1_table = NULL;
}
l1_allocated = 1; l1_allocated = 1;
if (bdrv_pread(s->hd, l1_table_offset, if (bdrv_pread(s->hd, l1_table_offset,
l1_table, l1_size2) != l1_size2) l1_table, l1_size2) != l1_size2)
@ -769,12 +773,16 @@ static int check_refcounts_l1(BlockDriverState *bs,
l1_table_offset, l1_size2); l1_table_offset, l1_size2);
/* Read L1 table entries from disk */ /* Read L1 table entries from disk */
l1_table = qemu_malloc(l1_size2); if (l1_size2 == 0) {
if (bdrv_pread(s->hd, l1_table_offset, l1_table = NULL;
l1_table, l1_size2) != l1_size2) } else {
goto fail; l1_table = qemu_malloc(l1_size2);
for(i = 0;i < l1_size; i++) if (bdrv_pread(s->hd, l1_table_offset,
be64_to_cpus(&l1_table[i]); l1_table, l1_size2) != l1_size2)
goto fail;
for(i = 0;i < l1_size; i++)
be64_to_cpus(&l1_table[i]);
}
/* Do the actual checks */ /* Do the actual checks */
for(i = 0; i < l1_size; i++) { for(i = 0; i < l1_size; i++) {

7
block/qcow2-snapshot.c
View File

@ -266,7 +266,12 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
sn->l1_table_offset = qcow2_alloc_clusters(bs, s->l1_size * sizeof(uint64_t)); sn->l1_table_offset = qcow2_alloc_clusters(bs, s->l1_size * sizeof(uint64_t));
sn->l1_size = s->l1_size; sn->l1_size = s->l1_size;
l1_table = qemu_malloc(s->l1_size * sizeof(uint64_t)); if (s->l1_size != 0) {
l1_table = qemu_malloc(s->l1_size * sizeof(uint64_t));
} else {
l1_table = NULL;
}
for(i = 0; i < s->l1_size; i++) { for(i = 0; i < s->l1_size; i++) {
l1_table[i] = cpu_to_be64(s->l1_table[i]); l1_table[i] = cpu_to_be64(s->l1_table[i]);
} }