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

qcow2: Add Error ** to qcow2_read_snapshots() 

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20191011152814.14791-4-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-10-11 17:28:01 +02:00
parent d8fa8442ad
commit ecf6c7c0c1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block/qcow2-snapshot.c
View File

@ -43,7 +43,7 @@ void qcow2_free_snapshots(BlockDriverState *bs)
s->nb_snapshots = 0; s->nb_snapshots = 0;
} }
int qcow2_read_snapshots(BlockDriverState *bs) int qcow2_read_snapshots(BlockDriverState *bs, Error **errp)
{ {
BDRVQcow2State *s = bs->opaque; BDRVQcow2State *s = bs->opaque;
QCowSnapshotHeader h; QCowSnapshotHeader h;
@ -68,6 +68,7 @@ int qcow2_read_snapshots(BlockDriverState *bs)
offset = ROUND_UP(offset, 8); offset = ROUND_UP(offset, 8);
ret = bdrv_pread(bs->file, offset, &h, sizeof(h)); ret = bdrv_pread(bs->file, offset, &h, sizeof(h));
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "Failed to read snapshot table");
goto fail; goto fail;
} }
@ -88,6 +89,7 @@ int qcow2_read_snapshots(BlockDriverState *bs)
ret = bdrv_pread(bs->file, offset, &extra, ret = bdrv_pread(bs->file, offset, &extra,
MIN(sizeof(extra), extra_data_size)); MIN(sizeof(extra), extra_data_size));
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "Failed to read snapshot table");
goto fail; goto fail;
} }
offset += extra_data_size; offset += extra_data_size;
@ -107,6 +109,7 @@ int qcow2_read_snapshots(BlockDriverState *bs)
sn->id_str = g_malloc(id_str_size + 1); sn->id_str = g_malloc(id_str_size + 1);
ret = bdrv_pread(bs->file, offset, sn->id_str, id_str_size); ret = bdrv_pread(bs->file, offset, sn->id_str, id_str_size);
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "Failed to read snapshot table");
goto fail; goto fail;
} }
offset += id_str_size; offset += id_str_size;
@ -116,6 +119,7 @@ int qcow2_read_snapshots(BlockDriverState *bs)
sn->name = g_malloc(name_size + 1); sn->name = g_malloc(name_size + 1);
ret = bdrv_pread(bs->file, offset, sn->name, name_size); ret = bdrv_pread(bs->file, offset, sn->name, name_size);
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "Failed to read snapshot table");
goto fail; goto fail;
} }
offset += name_size; offset += name_size;
@ -123,6 +127,7 @@ int qcow2_read_snapshots(BlockDriverState *bs)
if (offset - s->snapshots_offset > QCOW_MAX_SNAPSHOTS_SIZE) { if (offset - s->snapshots_offset > QCOW_MAX_SNAPSHOTS_SIZE) {
ret = -EFBIG; ret = -EFBIG;
error_setg(errp, "Snapshot table is too big");
goto fail; goto fail;
} }
} }

3
block/qcow2.c
View File

@ -1584,9 +1584,8 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
s->snapshots_offset = header.snapshots_offset; s->snapshots_offset = header.snapshots_offset;
s->nb_snapshots = header.nb_snapshots; s->nb_snapshots = header.nb_snapshots;
ret = qcow2_read_snapshots(bs); ret = qcow2_read_snapshots(bs, errp);
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "Could not read snapshots");
goto fail; goto fail;
} }

2
block/qcow2.h
View File

@ -708,7 +708,7 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs,
Error **errp); Error **errp);
void qcow2_free_snapshots(BlockDriverState *bs); void qcow2_free_snapshots(BlockDriverState *bs);
int qcow2_read_snapshots(BlockDriverState *bs); int qcow2_read_snapshots(BlockDriverState *bs, Error **errp);
/* qcow2-cache.c functions */ /* qcow2-cache.c functions */
Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables, Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables,