mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/display/artist: Refactor artist_rop8() to avoid buffer over-run

Browse Source 
Invalid I/O writes can craft an offset out of the vram_buffer range.
Instead of passing an unsafe pointer to artist_rop8(), pass the vram_buffer and
the offset. We can now check if the offset is in range before accessing it.

We avoid:

  Program terminated with signal SIGSEGV, Segmentation fault.
  284             *dst &= ~plane_mask;
  (gdb) bt
  #0  0x000056367b2085c0 in artist_rop8 (s=0x56367d38b510, dst=0x7f9f972fffff <error: Cannot access memory at address 0x7f9f972fffff>, val=0 '\000') at hw/display/artist.c:284
  #1  0x000056367b209325 in draw_line (s=0x56367d38b510, x1=-20480, y1=-1, x2=0, y2=17920, update_start=true, skip_pix=-1, max_pix=-1) at hw/display/artist.c:646

Reported-by: LLVM libFuzzer
Buglink: https://bugs.launchpad.net/qemu/+bug/1880326
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
Philippe Mathieu-Daudé 2020-05-23 21:15:16 +02:00 committed by Helge Deller
parent b87a7355de
commit 84a7b7741a
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/display/artist.c
View File

@ -273,11 +273,20 @@ static artist_rop_t artist_get_op(ARTISTState *s)
return (s->image_bitmap_op >> 8) & 0xf; return (s->image_bitmap_op >> 8) & 0xf;
} }
static void artist_rop8(ARTISTState *s, uint8_t *dst, uint8_t val) static void artist_rop8(ARTISTState *s, struct vram_buffer *buf,
int offset, uint8_t val)
{ {
const artist_rop_t op = artist_get_op(s); const artist_rop_t op = artist_get_op(s);
uint8_t plane_mask = s->plane_mask & 0xff; uint8_t plane_mask;
uint8_t *dst;
if (offset < 0 || offset >= buf->size) {
qemu_log_mask(LOG_GUEST_ERROR,
"rop8 offset:%d bufsize:%u\n", offset, buf->size);
return;
}
dst = buf->data + offset;
plane_mask = s->plane_mask & 0xff;
switch (op) { switch (op) {
case ARTIST_ROP_CLEAR: case ARTIST_ROP_CLEAR:
@ -375,7 +384,7 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,
for (i = 0; i < pix_count; i++) { for (i = 0; i < pix_count; i++) {
uint32_t off = offset + pix_count - 1 - i; uint32_t off = offset + pix_count - 1 - i;
if (off < buf->size) { if (off < buf->size) {
artist_rop8(s, p + off, artist_rop8(s, buf, off,
(data & 1) ? (s->plane_mask >> 24) : 0); (data & 1) ? (s->plane_mask >> 24) : 0);
} }
data >>= 1; data >>= 1;
@ -395,7 +404,7 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,
s->vram_bitmask & (1 << (28 + i))) { s->vram_bitmask & (1 << (28 + i))) {
uint32_t off = offset + 3 - i; uint32_t off = offset + 3 - i;
if (off < buf->size) { if (off < buf->size) {
artist_rop8(s, p + off, data8[ROP8OFF(i)]); artist_rop8(s, buf, off, data8[ROP8OFF(i)]);
} }
} }
} }
@ -424,10 +433,10 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,
if (!(s->image_bitmap_op & 0x20000000) || if (!(s->image_bitmap_op & 0x20000000) ||
(vram_bitmask & mask)) { (vram_bitmask & mask)) {
if (data & mask) { if (data & mask) {
artist_rop8(s, p + offset + i, s->fg_color); artist_rop8(s, buf, offset + i, s->fg_color);
} else { } else {
if (!(s->image_bitmap_op & 0x10000002)) { if (!(s->image_bitmap_op & 0x10000002)) {
artist_rop8(s, p + offset + i, s->bg_color); artist_rop8(s, buf, offset + i, s->bg_color);
} }
} }
} }
@ -505,7 +514,7 @@ static void block_move(ARTISTState *s, int source_x, int source_y, int dest_x,
if (dst + column > buf->size || src + column > buf->size) { if (dst + column > buf->size || src + column > buf->size) {
continue; continue;
} }
artist_rop8(s, buf->data + dst + column, buf->data[src + column]); artist_rop8(s, buf, dst + column, buf->data[src + column]);
} }
} }
@ -546,7 +555,7 @@ static void fill_window(ARTISTState *s, int startx, int starty,
offset = y * s->width; offset = y * s->width;
for (x = startx; x < startx + width; x++) { for (x = startx; x < startx + width; x++) {
artist_rop8(s, buf->data + offset + x, color); artist_rop8(s, buf, offset + x, color);
} }
} }
artist_invalidate_lines(buf, starty, height); artist_invalidate_lines(buf, starty, height);
@ -559,7 +568,6 @@ static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2,
uint8_t color; uint8_t color;
int dx, dy, t, e, x, y, incy, diago, horiz; int dx, dy, t, e, x, y, incy, diago, horiz;
bool c1; bool c1;
uint8_t *p;
trace_artist_draw_line(x1, y1, x2, y2); trace_artist_draw_line(x1, y1, x2, y2);
@ -628,16 +636,18 @@ static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2,
color = artist_get_color(s); color = artist_get_color(s);
do { do {
int ofs;
if (c1) { if (c1) {
p = buf->data + x * s->width + y; ofs = x * s->width + y;
} else { } else {
p = buf->data + y * s->width + x; ofs = y * s->width + x;
} }
if (skip_pix > 0) { if (skip_pix > 0) {
skip_pix--; skip_pix--;
} else { } else {
artist_rop8(s, p, color); artist_rop8(s, buf, ofs, color);
} }
if (e > 0) { if (e > 0) {
@ -771,10 +781,10 @@ static void font_write16(ARTISTState *s, uint16_t val)
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
mask = 1 << (15 - i); mask = 1 << (15 - i);
if (val & mask) { if (val & mask) {
artist_rop8(s, buf->data + offset + i, color); artist_rop8(s, buf, offset + i, color);
} else { } else {
if (!(s->image_bitmap_op & 0x20000000)) { if (!(s->image_bitmap_op & 0x20000000)) {
artist_rop8(s, buf->data + offset + i, s->bg_color); artist_rop8(s, buf, offset + i, s->bg_color);
} }
} }
} }