Skip to content

Commit

Permalink
block/vpc: Avoid dynamic stack allocation
Browse files Browse the repository at this point in the history
Use autofree heap allocation instead of variable-length array on the
stack. Here we don't expect the bitmap size to be enormous, and
since we're about to read/write it to disk the overhead of the
allocation should be fine.

The codebase has very few VLAs, and if we can get rid of them all we
can make the compiler error on new additions.  This is a defensive
measure against security bugs where an on-stack dynamic allocation
isn't correctly size-checked (e.g.  CVE-2021-3527).

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[PMM: expanded commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230811175229.808139-1-peter.maydell@linaro.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Francisco Iglesias <frasse.iglesias@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
philmd authored and kevmw committed Sep 1, 2023
1 parent 17780ed commit 17cf482
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions block/vpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ get_image_offset(BlockDriverState *bs, uint64_t offset, bool write, int *err)
miss sparse read optimization, but it's not a problem in terms of
correctness. */
if (write && (s->last_bitmap_offset != bitmap_offset)) {
uint8_t bitmap[s->bitmap_size];
g_autofree uint8_t *bitmap = g_malloc(s->bitmap_size);
int r;

s->last_bitmap_offset = bitmap_offset;
Expand Down Expand Up @@ -558,7 +558,7 @@ alloc_block(BlockDriverState *bs, int64_t offset)
int64_t bat_offset;
uint32_t index, bat_value;
int ret;
uint8_t bitmap[s->bitmap_size];
g_autofree uint8_t *bitmap = g_malloc(s->bitmap_size);

/* Check if sector_num is valid */
if ((offset < 0) || (offset > bs->total_sectors * BDRV_SECTOR_SIZE)) {
Expand Down

0 comments on commit 17cf482

Please sign in to comment.