Skip to content

RFC hw/display/qxl: Avoid buffer overrun in qxl_phys2virt()

Philippe Mathieu-Daudé qemu-devel 2 versions Applied

Status from this message: Merged, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 RFC Latest5 patches 2 repliesApplied
  2. v1 RFC5 patches 14 repliesSuperseded

Changes in v3 from the cover letter

- Do not abort checking guest-provided addresses (Stefan)
- Handle chunked QEMUCursor (Gerd)

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/5hw/display/qxl: Have qxl_log_command Return early if no log_cmd handlerhw/display/qxl-logger.c+11 -00 replies
2/5hw/display/qxl: Document qxl_phys2virt()hw/display/qxl.h+19 -00 replies
3/5hw/display/qxl: Pass requested buffer size to qxl_phys2virt()hw/display/qxl-logger.c hw/display/qxl-render.c hw/display/qxl.c +1 more+36 -131 reply
4/5hw/display/qxl: Avoid buffer overrun in qxl_phys2virt (CVE-2022-4144)hw/display/qxl.c hw/display/qxl.h+24 -50 replies
5/5hw/display/qxl: Assert memory slot fits in preallocated MemoryRegionhw/display/qxl.c+1 -00 replies

Reviews trailers per patch

3 of 5 patches have a Reviewed-by or Acked-by.

PatchMarc-André LureauGerd Hoffmann
1/5R-b
2/5R-b
3/5R-b A-b
4/5
5/5

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [RFC PATCH-for-7.2 v3 0/5] hw/display/qxl: Avoid buffer overrun in qxl_phys2virt()

Since v2:
- Do not abort checking guest-provided addresses (Stefan)
- Handle chunked QEMUCursor (Gerd)

Since v1:
- Moved overrun check in qxl_get_check_slot_offset (Marc-André)

memory_region_get_ram_ptr() returns a host pointer for a MemoryRegion. Sometimes we do offset calculation using this pointer without checking the underlying MemoryRegion size.

Wenxu Yin reported a buffer overrun in QXL. This series aims to fix it. I haven't audited the other _get_ram_ptr() uses (yet). Eventually we could rename it _get_ram_ptr_unsafe and add a safer helper which checks for overrun.

Worth considering for 7.2?

Regards,

Phil.

Philippe Mathieu-Daudé (5):
hw/display/qxl: Have qxl_log_command Return early if no log_cmd
handler
hw/display/qxl: Document qxl_phys2virt()
hw/display/qxl: Pass requested buffer size to qxl_phys2virt() hw/display/qxl: Avoid buffer overrun in qxl_phys2virt (CVE-2022-4144) hw/display/qxl: Assert memory slot fits in preallocated MemoryRegion

 hw/display/qxl-logger.c | 22 ++++++++++++++++++---
 hw/display/qxl-render.c | 20 ++++++++++++++++----
 hw/display/qxl.c        | 42 ++++++++++++++++++++++++++++++++---------
 hw/display/qxl.h        | 23 +++++++++++++++++++++-
 4 files changed, 90 insertions(+), 17 deletions(-)
Signature · 1 line
2.38.1