hw/display/qxl: Fix mono cursor validation that can read past a cursor chunk
PATCH 1/1 hw/display/qxl: Fix mono cursor validation that can read past a cursor chunk
From: Thomas Huth <[email protected]>
qxl_render_cursor() maps the guest-provided QXLCursor object using the guest-controlled cursor->chunk.data_size.
For a mono cursor, qxl_cursor() then validates the expected bitmap size against cursor->data_size, but it does not validate that the first chunk actually contains that many bytes.
A guest could set cursor->data_size to the correct full mono cursor size while setting cursor->chunk.data_size to zero. In that case, cursor_set_mono() reads the AND/XOR masks starting at cursor->chunk.data. If the cursor object is placed at the end of the QXL RAM BAR, those reads cross the mapped RAM region and could crash the QEMU process (e.g. under ASan).
Fix it by double-checking cursor->chunk.data_size for the correct size.
This patch is based on the suggested changes by the reporter in the bug ticket.
Reported-by: huntr bubble
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3646
--- hw/display/qxl-render.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
hw/display/qxl-render.c +5 -3
@@ -272,9 +272,11 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,case SPICE_CURSOR_TYPE_MONO :/* Assume that the full cursor is available in a single chunk. */ size =2 *cursor_get_mono_bpl (c) * c->height; -if (size != cursor->data_size) { -fprintf (stderr,"%s: bad monochrome cursor %ux%u with size %u\n" , - __func__, c->width, c->height, cursor->data_size); +if (size != cursor->data_size || cursor->chunk.data_size < size) { +qxl_set_guest_bug (qxl,"%s: bad monochrome cursor %ux%u" +" data_size %u chunk_size %u" , + __func__, c->width, c->height, + cursor->data_size, cursor->chunk.data_size); goto fail; } and_mask = cursor->chunk.data;
Signature · 1 line
2.54.0
Hi
Quoted 32 lines · Thomas Huth
From: Thomas Huth <[email protected]>
qxl_render_cursor()maps the guest-provided QXLCursor object using the guest-controlledcursor->chunk.data_size.
For a mono cursor,qxl_cursor()then validates the expected bitmap size againstcursor->data_size, but it does not validate that the first chunk actually contains that many bytes.
A guest could setcursor->data_sizeto the correct full mono cursor size while settingcursor->chunk.data_sizeto zero. In that case,cursor_set_mono()reads the AND/XOR masks starting atcursor->chunk.data. If the cursor object is placed at the end of the QXL RAM BAR, those reads cross the mapped RAM region and could crash the QEMU process (e.g. under ASan).Fix it by double-checking
cursor->chunk.data_sizefor the correct size.This patch is based on the suggested changes by the reporter in the bug ticket.
Reported-by: huntr bubble
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3646Signed-off-by Thomas Huth <[email protected]>--- hw/display/qxl-render.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)hw/display/qxl-render.c +0
-0@@ -272,9 +272,11 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,case SPICE_CURSOR_TYPE_MONO :
hw/display/qxl-render.c static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor, · line 279
Quoted 10 lines
hw/display/qxl-render.c +5
-3/* Assume that the full cursor is available in a single chunk. */ size =2 *cursor_get_mono_bpl (c) * c->height; -if (size != cursor->data_size) { -fprintf (stderr,"%s: bad monochrome cursor %ux%u with size %u\n" , - __func__, c->width, c->height, cursor->data_size); +if (size != cursor->data_size || cursor->chunk.data_size < size) { +qxl_set_guest_bug (qxl,"%s: bad monochrome cursor %ux%u" +" data_size %u chunk_size %u" , + __func__, c->width, c->height, + cursor->data_size, cursor->chunk.data_size);
Hopefully spice does chunk.data_size validation..