mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-12-08 22:02:44 +03:00
ui/vnc-enc-hextile: Use static rather than dynamic length stack array
In the send_hextile_tile_* function we create a variable length array data[]. In fact we know that the client_pf.bytes_per_pixel is at most 4 (enforced by set_pixel_format()), so we can make the array a compile-time fixed length of 1536 bytes. 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: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> [ Marc-André - rename BPP to MAX_BYTES_PER_PIXEL ] Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20230818151057.1541189-3-peter.maydell@linaro.org>
This commit is contained in:
parent
1663ffb915
commit
e12acaf75d
@ -7,6 +7,8 @@
|
||||
#define NAME BPP
|
||||
#endif
|
||||
|
||||
#define MAX_BYTES_PER_PIXEL 4
|
||||
|
||||
static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
|
||||
int x, int y, int w, int h,
|
||||
void *last_bg_,
|
||||
@ -25,10 +27,13 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
|
||||
int bg_count = 0;
|
||||
int fg_count = 0;
|
||||
int flags = 0;
|
||||
uint8_t data[(vs->client_pf.bytes_per_pixel + 2) * 16 * 16];
|
||||
uint8_t data[(MAX_BYTES_PER_PIXEL + 2) * 16 * 16];
|
||||
int n_data = 0;
|
||||
int n_subtiles = 0;
|
||||
|
||||
/* Enforced by set_pixel_format() */
|
||||
assert(vs->client_pf.bytes_per_pixel <= MAX_BYTES_PER_PIXEL);
|
||||
|
||||
for (j = 0; j < h; j++) {
|
||||
for (i = 0; i < w; i++) {
|
||||
switch (n_colors) {
|
||||
@ -205,6 +210,7 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
|
||||
}
|
||||
}
|
||||
|
||||
#undef MAX_BYTES_PER_PIXEL
|
||||
#undef NAME
|
||||
#undef pixel_t
|
||||
#undef CONCAT_I
|
||||
|
Loading…
Reference in New Issue
Block a user