Skip to content

Commit

Permalink
qcow2: Fix refcount table size calculation
Browse files Browse the repository at this point in the history
A missing factor for the refcount table entry size in the calculation
could mean that too little memory was allocated for the in-memory
representation of the table, resulting in a buffer overflow.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Tested-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
kevmw committed Nov 14, 2012
1 parent 8809e28 commit a354807
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion block/qcow2-refcount.c
Expand Up @@ -301,7 +301,8 @@ static int alloc_refcount_block(BlockDriverState *bs,
uint64_t last_table_size;
uint64_t blocks_clusters;
do {
uint64_t table_clusters = size_to_clusters(s, table_size);
uint64_t table_clusters =
size_to_clusters(s, table_size * sizeof(uint64_t));
blocks_clusters = 1 +
((table_clusters + refcount_block_clusters - 1)
/ refcount_block_clusters);
Expand Down

0 comments on commit a354807

Please sign in to comment.