mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bochs: Fix bitmap offset calculation

Browse Source 
32 bit truncation could let us access the wrong offset in the image.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2014-03-26 13:05:35 +01:00 committed by Stefan Hajnoczi
parent 8e53abbc20
commit a9ba36a45d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/bochs.c
View File

@ -186,8 +186,9 @@ static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num)
return -1; /* not allocated */ return -1; /* not allocated */
} }
bitmap_offset = s->data_offset + (512 * s->catalog_bitmap[extent_index] * bitmap_offset = s->data_offset +
(s->extent_blocks + s->bitmap_blocks)); (512 * (uint64_t) s->catalog_bitmap[extent_index] *
(s->extent_blocks + s->bitmap_blocks));
/* read in bitmap for current extent */ /* read in bitmap for current extent */
if (bdrv_pread(bs->file, bitmap_offset + (extent_offset / 8), if (bdrv_pread(bs->file, bitmap_offset + (extent_offset / 8),