Skip to content

Commit

Permalink
block: fix theoretical overflow in bdrv_init_padding()
Browse files Browse the repository at this point in the history
Calculation of sum may theoretically overflow, so use 64bit type and
add some good assertions.

Use int64_t constantly.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201211183934.169161-4-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: tweak assertion order]
Signed-off-by: Eric Blake <eblake@redhat.com>
  • Loading branch information
Vladimir Sementsov-Ogievskiy authored and ebblake committed Feb 3, 2021
1 parent 4c002ce commit a56ed80
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions block/io.c
Expand Up @@ -1565,8 +1565,12 @@ static bool bdrv_init_padding(BlockDriverState *bs,
int64_t offset, int64_t bytes,
BdrvRequestPadding *pad)
{
uint64_t align = bs->bl.request_alignment;
size_t sum;
int64_t align = bs->bl.request_alignment;
int64_t sum;

bdrv_check_request(offset, bytes, &error_abort);
assert(align <= INT_MAX); /* documented in block/block_int.h */
assert(align <= SIZE_MAX / 2); /* so we can allocate the buffer */

memset(pad, 0, sizeof(*pad));

Expand Down

0 comments on commit a56ed80

Please sign in to comment.