target-hppa fixes
v2 cover target-hppa fixes
A few late fixes for target-hppa:
* Fix the SeaBIOS-hppa firmware build with gcc-10 on Debian
* Fix the following runtime warning with artist framebuffer:
"write outside bounds: wants 1256x1023, max size 1280x1024"
in addition the SeaBIOS-hppa firmware now includes a version check to prevent starting when it's incompatible to the emulated qemu hardware.
Helge
----------------------------------------------------------------
Changes to v1:
* added Ack by Richard Henderson for the first patch
* revised out of bounds check based on Richards feedback
----------------------------------------------------------------
Helge Deller (3):
hw/hppa: Sync hppa_hardware.h file with SeaBIOS sources
seabios-hppa: Update to SeaBIOS hppa version 1 hw/hppa: Implement proper SeaBIOS version check
Sven Schnelle (1):
hw/display/artist.c: fix out of bounds check
hw/display/artist.c | 18 ++++++------------ hw/hppa/hppa_hardware.h | 6 ++++++ hw/hppa/lasi.c | 2 -- hw/hppa/machine.c | 22 ++++++++++++++++++++++ pc-bios/hppa-firmware.img | Bin 766136 -> 783144 bytes roms/seabios-hppa | 2 +- 6 files changed, 35 insertions(+), 15 deletions(-)
--
2.21.3
Helge Deller (3):
hw/hppa: Sync hppa_hardware.h file with SeaBIOS sources
seabios-hppa: Update to SeaBIOS hppa version 1 hw/hppa: Implement proper SeaBIOS version check
Sven Schnelle (1):
hw/display/artist.c: fix out of bounds check
hw/display/artist.c | 24 +++++++++++------------- hw/hppa/hppa_hardware.h | 6 ++++++ hw/hppa/lasi.c | 2 -- hw/hppa/machine.c | 22 ++++++++++++++++++++++ pc-bios/hppa-firmware.img | Bin 766136 -> 783144 bytes roms/seabios-hppa | 2 +- 6 files changed, 40 insertions(+), 16 deletions(-)
--
2.21.3
PATCH v2 1/4 hw/hppa: Sync hppa_hardware.h file with SeaBIOS sources
The hppa_hardware.h file is shared with SeaBIOS. Sync it.
--- hw/hppa/hppa_hardware.h | 6 ++++++ hw/hppa/lasi.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-)
hw/hppa/hppa_hardware.h +6 -0
@@ -17,6 +17,7 @@#define LASI_UART_HPA 0xffd05000#define LASI_SCSI_HPA 0xffd06000#define LASI_LAN_HPA 0xffd07000 +#define LASI_RTC_HPA 0xffd09000#define LASI_LPT_HPA 0xffd02000#define LASI_AUDIO_HPA 0xffd04000#define LASI_PS2KBD_HPA 0xffd08000
@@ -37,10 +38,15 @@#define PORT_PCI_CMD (PCI_HPA + DINO_PCI_ADDR)#define PORT_PCI_DATA (PCI_HPA + DINO_CONFIG_DATA) +/* QEMU fw_cfg interface port */ +#define QEMU_FW_CFG_IO_BASE (MEMORY_HPA + 0x80) +#define PORT_SERIAL1 (DINO_UART_HPA + 0x800)#define PORT_SERIAL2 (LASI_UART_HPA + 0x800)#define HPPA_MAX_CPUS 8/* max. number of SMP CPUs */ #define CPU_CLOCK_MHZ 250/* emulate a 250 MHz CPU */ +#define CPU_HPA_CR_REG 7/* store CPU HPA in cr7 (SeaBIOS internal) */ +#endif
hw/hppa/lasi.c +0 -2
@@ -54,8 +54,6 @@#define LASI_CHIP (obj) \ OBJECT_CHECK(LasiState, (obj), TYPE_LASI_CHIP) -#define LASI_RTC_HPA (LASI_HPA + 0x9000) - typedef struct LasiState { PCIHostState parent_obj;
--
2.21.3
PATCH v2 2/4 seabios-hppa: Update to SeaBIOS hppa version 1
In reply to Helge DellerChanges include:
* Introduce SeaBIOS firmware version check
* Implement QEMU fw_cfg interface support
* Fix endian bug in romfile_loadint()
* gcc-10 compile fix
Required for proper version checking and gcc-10 update on Debian.
--- pc-bios/hppa-firmware.img | Bin 766136 -> 783144 bytes roms/seabios-hppa | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)
pc-bios/hppa-firmware.img binary +0 -0
roms/seabios-hppa +1 -1
@@ -1 +1 @@ -Subproject commit 1630ac7d65c4a09218cc677f1fa56cd5b3140447 +Subproject commit 004258352cd89a30367ccc97f8a0a30f92e42717
--
2.21.3
PATCH v2 3/4 hw/hppa: Implement proper SeaBIOS version check
In reply to Helge DellerIt's important that the SeaBIOS hppa firmware is at least at a minimal level to ensure proper interaction between qemu and firmware.
Implement a proper firmware version check by telling SeaBIOS via the fw_cfg interface which minimal SeaBIOS version is required by this running qemu instance. If the firmware detects that it's too old, it will stop.
--- hw/hppa/machine.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
hw/hppa/machine.c +22 -0
@@ -25,6 +25,8 @@#define MAX_IDE_BUS 2 +#define MIN_SEABIOS_HPPA_VERSION 1/* require at least this fw version */ +static ISABus *hppa_isa_bus (void ) {ISABus *isa_bus;
@@ -56,6 +58,23 @@ static uint64_t cpu_hppa_to_phys(void *opaque, uint64_t addr)static HPPACPU *cpu[HPPA_MAX_CPUS ];static uint64_t firmware_entry; +static FWCfgState *create_fw_cfg (MachineState *ms) +{ +FWCfgState *fw_cfg; +uint64_t val; + + fw_cfg =fw_cfg_init_mem (QEMU_FW_CFG_IO_BASE ,QEMU_FW_CFG_IO_BASE +4 ); +fw_cfg_add_i16 (fw_cfg,FW_CFG_NB_CPUS , ms->smp.cpus); +fw_cfg_add_i16 (fw_cfg,FW_CFG_MAX_CPUS ,HPPA_MAX_CPUS ); +fw_cfg_add_i64 (fw_cfg,FW_CFG_RAM_SIZE , ram_size); + + val =cpu_to_le64 (MIN_SEABIOS_HPPA_VERSION ); +fw_cfg_add_file (fw_cfg,"/etc/firmware-min-version" , +g_memdup (&val,sizeof (val)),sizeof (val)); + +return fw_cfg; +} +static void machine_hppa_init (MachineState *machine) {const char *kernel_filename = machine->kernel_filename;
@@ -118,6 +137,9 @@ static void machine_hppa_init(MachineState *machine) 115200, serial_hd(0), DEVICE_BIG_ENDIAN); } +/* fw_cfg configuration interface */ +create_fw_cfg (machine); +/* SCSI disk setup. */ dev =DEVICE (pci_create_simple (pci_bus,-1 ,"lsi53c895a" ));lsi53c8xx_handle_legacy_cmdline (dev);
--
2.21.3
PATCH v2 4/4 hw/display/artist.c: fix out of bounds check
In reply to Helge DellerFrom: Sven Schnelle <[email protected]>
--- hw/display/artist.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
hw/display/artist.c +11 -13
@@ -340,14 +340,13 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, {struct vram_buffer *buf;uint32_t vram_bitmask = s->vram_bitmask; -int mask, i, pix_count, pix_length, offset, height, width; +int mask, i, pix_count, pix_length, offset, width;uint8_t *data8, *p; pix_count =vram_write_pix_per_transfer (s); pix_length =vram_pixel_length (s); buf =vram_write_buffer (s); - height = buf->height; width = buf->width;if (s->cmap_bm_access) {
@@ -367,13 +366,6 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, pix_count = size *8 ; } -if (posy * width + posx + pix_count > buf->size) { -qemu_log ("write outside bounds: wants %dx%d, max size %dx%d\n" , - posx, posy, width, height); -return ; - } - -switch (pix_length) {case 0 :if (s->image_bitmap_op &0x20000000 ) {
@@ -381,8 +373,11 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, }for (i =0 ; i < pix_count; i++) { -artist_rop8 (s, p + offset + pix_count -1 - i, - (data &1 ) ? (s->plane_mask >>24 ) :0 ); +uint32_t off = offset + pix_count -1 - i; +if (off < buf->size) { +artist_rop8 (s, p + off, + (data &1 ) ? (s->plane_mask >>24 ) :0 ); + } data >>=1 ; }memory_region_set_dirty (&buf->mr, offset, pix_count);
@@ -398,7 +393,10 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,for (i =3 ; i >=0 ; i--) {if (!(s->image_bitmap_op &0x20000000 ) || s->vram_bitmask & (1 << (28 + i))) { -artist_rop8 (s, p + offset +3 - i, data8[ROP8OFF (i)]); +uint32_t off = offset +3 - i; +if (off < buf->size) { +artist_rop8 (s, p + off, data8[ROP8OFF (i)]); + } } }memory_region_set_dirty (&buf->mr, offset,3 );
@@ -420,7 +418,7 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,break ; } -for (i =0 ; i < pix_count; i++) { +for (i =0 ; i < pix_count && offset + i < buf->size; i++) { mask =1 << (pix_count -1 - i); if (!(s->image_bitmap_op & 0x20000000) ||
--
2.21.3
Re: [PATCH v2 4/4] hw/display/artist.c: fix out of bounds check
Quoted 7 lines · Helge Deller
From: Sven Schnelle <[email protected]>
Signed-off-by Sven Schnelle <[email protected]>Signed-off-by Helge Deller <[email protected]>--- hw/display/artist.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
Looks ok, if not ideal.
r~
Re: [PATCH v2 4/4] hw/display/artist.c: fix out of bounds check
In reply to Helge DellerHi,
I applied this patch, but I can still trigger a segfault and heap overread through artist_reg_write -> fill_window. I dont know if these problems are related to what this patch fixes. If not, let me know and I can create a separate launchpad report for these.
-Alex
(1) Segfault:
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none \
-qtest stdio -accel qtest
writeq 0xf8100a02 0x845c235c223f0584
EOF
AddressSanitizer: SEGV on unknown address 0x7fa50235cc00
#0 0x555577f8b392 in artist_rop8/hw/display/artist.c:284:14
#1 0x555577f84603 in fill_window/hw/display/artist.c:549:13
#2 0x555577f7abfc in artist_reg_write/hw/display/artist.c:895:9 #3 0x55557766d7a3 in memory_region_write_accessor/softmmu/memory.c:483:5 #4 0x55557766cadc in access_with_adjusted_size/softmmu/memory.c:539:18 #5 0x55557766a873 in memory_region_dispatch_write/softmmu/memory.c:1466:16 #6 0x555576d18056 in flatview_write_continue/exec.c:3176:23
#7 0x555576d00866 in flatview_write/exec.c:3216:14
#8 0x555576d00387 in address_space_write/exec.c:3308:18
#9 0x555577714604 in qtest_process_command/softmmu/qtest.c:452:13
===========================================================
(2) Heap Overflow:
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none -m 64 \
-qtest stdio -accel qtest
writeq 0xf8100a02 0x8cd00011900a0203
EOF
AddressSanitizer: heap-buffer-overflow on address 0x603000045bc8 at pc 0x55bb3196f704 bp 0x7fff1c701d70 sp 0x7fff1c701d68 READ of size 8 at 0x603000045bc8 thread T0
#0 0x55bb3196f703 in cpu_physical_memory_set_dirty_range/include/exec/ram_addr.h:318:35 #1 0x55bb3196e6f2 in memory_region_set_dirty/softmmu/memory.c:1994:5
#2 0x55bb32279bb6 in artist_invalidate_lines/hw/display/artist.c:212:9
#3 0x55bb3227165d in fill_window/hw/display/artist.c:552:5
#4 0x55bb32267bfc in artist_reg_write/hw/display/artist.c:895:9
#5 0x55bb3195a7a3 in memory_region_write_accessor/softmmu/memory.c:483:5 #6 0x55bb31959adc in access_with_adjusted_size/softmmu/memory.c:539:18
#7 0x55bb31957873 in memory_region_dispatch_write/softmmu/memory.c:1466:16 #8 0x55bb31005056 in flatview_write_continue/exec.c:3176:23
#9 0x55bb30fed866 in flatview_write/exec.c:3216:14
#10 0x55bb30fed387 in address_space_write/exec.c:3308:18
0x603000045bc8 is located 0 bytes to the right of 24-byte region [0x603000045bb0,0x603000045bc8) allocated by thread T0 here:
#0 0x55bb30f7111d in malloc ()
#1 0x7fdae3d35500 in g_malloc (/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x54500) #2 0x55bb30fd84d4 in ram_block_add/exec.c:2268:9
#3 0x55bb30fded16 in qemu_ram_alloc_internal/exec.c:2441:5
#4 0x55bb30fdefed in qemu_ram_alloc/exec.c:2460:12
#5 0x55bb3195c0be in memory_region_init_ram_shared_nomigrate/softmmu/memory.c:1515:21 #6 0x55bb31cd6544 in ram_backend_memory_alloc/backends/hostmem-ram.c:30:5
#7 0x55bb31ccf875 in host_memory_backend_memory_complete/backends/hostmem.c:333:9 #8 0x55bb3360737e in user_creatable_complete/qom/object_interfaces.c:23:9
#9 0x55bb31a44e59 in create_default_memdev/softmmu/vl.c:2830:5
#10 0x55bb31a2d528 in qemu_init/softmmu/vl.c:4352:9
#11 0x55bb3405390c in main/softmmu/main.c:48:5
Quoted 81 lines · Helge Deller
From: Sven Schnelle <[email protected]>
Signed-off-by Sven Schnelle <[email protected]>Signed-off-by Helge Deller <[email protected]>--- hw/display/artist.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)hw/display/artist.c +11
-14@@ -340,14 +340,13 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, {struct vram_buffer *buf;uint32_t vram_bitmask = s->vram_bitmask; -int mask, i, pix_count, pix_length, offset, height, width; +int mask, i, pix_count, pix_length, offset, width;uint8_t *data8, *p; pix_count =vram_write_pix_per_transfer (s); pix_length =vram_pixel_length (s); buf =vram_write_buffer (s); - height = buf->height; width = buf->width;if (s->cmap_bm_access) {@@ -367,13 +366,6 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, pix_count = size *8 ; } -if (posy * width + posx + pix_count > buf->size) { -qemu_log ("write outside bounds: wants %dx%d, max size %dx%d\n" , - posx, posy, width, height); -return ; - } - -switch (pix_length) {case 0 :if (s->image_bitmap_op &0x20000000 ) {@@ -381,8 +373,11 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, }for (i =0 ; i < pix_count; i++) { -artist_rop8 (s, p + offset + pix_count -1 - i, - (data &1 ) ? (s->plane_mask >>24 ) :0 ); +uint32_t off = offset + pix_count -1 - i; +if (off < buf->size) { +artist_rop8 (s, p + off, + (data &1 ) ? (s->plane_mask >>24 ) :0 ); + } data >>=1 ; }memory_region_set_dirty (&buf->mr, offset, pix_count);@@ -398,7 +393,10 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,for (i =3 ; i >=0 ; i--) {if (!(s->image_bitmap_op &0x20000000 ) || s->vram_bitmask & (1 << (28 + i))) { -artist_rop8 (s, p + offset +3 - i, data8[ROP8OFF (i)]); +uint32_t off = offset +3 - i; +if (off < buf->size) { +artist_rop8 (s, p + off, data8[ROP8OFF (i)]); + } } }memory_region_set_dirty (&buf->mr, offset,3 );@@ -420,7 +418,7 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,break ; } -for (i =0 ; i < pix_count; i++) { +for (i =0 ; i < pix_count && offset + i < buf->size; i++) { mask =1 << (pix_count -1 - i); if (!(s->image_bitmap_op & 0x20000000) || --2.21.3
Re: [PATCH v2 4/4] hw/display/artist.c: fix out of bounds check
Quoted 5 lines · Alexander Bulekov
Hi,
I applied this patch, but I can still trigger a segfault and heap overread throughartist_reg_write->fill_window. I dont know if these problems are related to what this patch fixes. If not, let me know and I can create a separate launchpad report for these.
And another one through draw_line...
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none \
-qtest stdio -accel qtest
writeq 0xf8100e02 0x4f4f4f4f4f939600
EOF
==13563==ERROR: AddressSanitizer: SEGV on unknown address 0x7f3fe4d403fd (pc 0x55ae401eb392 bp 0x7ffea90ca2d0 sp 0x7ffea90ca1e0 T0) ==13563==The signal is caused by a READ memory access.
#0 0x55ae401eb392 in artist_rop8 /hw/display/artist.c:284:14
#1 0x55ae401ee163 in draw_line /hw/display/artist.c:635:13
#2 0x55ae401e730a in draw_line_size /hw/display/artist.c:685:5
#3 0x55ae401db25d in artist_reg_write /hw/display/artist.c:917:9
#4 0x55ae3f8cd7a3 in memory_region_write_accessor /softmmu/memory.c:483:5
#5 0x55ae3f8ccadc in access_with_adjusted_size /softmmu/memory.c:539:18
#6 0x55ae3f8ca873 in memory_region_dispatch_write /softmmu/memory.c:1466:16
#7 0x55ae3ef78056 in flatview_write_continue /exec.c:3176:23
#8 0x55ae3ef60866 in flatview_write /exec.c:3216:14
#9 0x55ae3ef60387 in address_space_write /exec.c:3308:18
#10 0x55ae3f974604 in qtest_process_command /softmmu/qtest.c:452:13
#11 0x55ae3f96bc08 in qtest_process_inbuf /softmmu/qtest.c:710:9
#12 0x55ae3f96a895 in qtest_read /softmmu/qtest.c:722:5
#13 0x55ae41e262f3 in qemu_chr_be_write_impl /chardev/char.c:188:9
#14 0x55ae41e26477 in qemu_chr_be_write /chardev/char.c:200:9
#15 0x55ae41e3a763 in fd_chr_read /chardev/char-fd.c:68:9
#16 0x55ae41f8eb24 in qio_channel_fd_source_dispatch /io/channel-watch.c:84:12
#17 0x7f400f6cc897 in g_main_context_dispatch ()
#18 0x55ae42386a2b in glib_pollfds_poll /util/main-loop.c:217:9
#19 0x55ae4238415b in os_host_main_loop_wait /util/main-loop.c:240:5
#20 0x55ae42383af4 in main_loop_wait /util/main-loop.c:516:11
#21 0x55ae3f98cd00 in qemu_main_loop /softmmu/vl.c:1676:9
#22 0x55ae41fc6911 in main /softmmu/main.c:49:5Quoted 141 lines
-Alex
(1) Segfault:
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none \
-qtest stdio -accel qtest
writeq0xf8100a020x845c235c223f0584
EOFAddressSanitizer: SEGV on unknown address
0x7fa50235cc00
#00x555577f8b392inartist_rop8/hw/display/artist.c:284:14
#10x555577f84603infill_window/hw/display/artist.c:549:13
#20x555577f7abfcinartist_reg_write/hw/display/artist.c:895:9#30x55557766d7a3inmemory_region_write_accessor/softmmu/memory.c:483:5#40x55557766cadcinaccess_with_adjusted_size/softmmu/memory.c:539:18#50x55557766a873inmemory_region_dispatch_write/softmmu/memory.c:1466:16#60x555576d18056inflatview_write_continue/exec.c:3176:23
#70x555576d00866inflatview_write/exec.c:3216:14
#80x555576d00387inaddress_space_write/exec.c:3308:18
#90x555577714604inqtest_process_command/softmmu/qtest.c:452:13===========================================================
(2) Heap Overflow:
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none -m 64 \
-qtest stdio -accel qtest
writeq0xf8100a020x8cd00011900a0203
EOFAddressSanitizer: heap-buffer-overflow on address
0x603000045bc8at pc0x55bb3196f704bp0x7fff1c701d70sp0x7fff1c701d68READ of size 8 at0x603000045bc8thread T0#0
0x55bb3196f703incpu_physical_memory_set_dirty_range/include/exec/ram_addr.h:318:35#10x55bb3196e6f2inmemory_region_set_dirty/softmmu/memory.c:1994:5
#20x55bb32279bb6inartist_invalidate_lines/hw/display/artist.c:212:9
#30x55bb3227165dinfill_window/hw/display/artist.c:552:5
#40x55bb32267bfcinartist_reg_write/hw/display/artist.c:895:9
#50x55bb3195a7a3inmemory_region_write_accessor/softmmu/memory.c:483:5#60x55bb31959adcinaccess_with_adjusted_size/softmmu/memory.c:539:18
#70x55bb31957873inmemory_region_dispatch_write/softmmu/memory.c:1466:16#80x55bb31005056inflatview_write_continue/exec.c:3176:23
#90x55bb30fed866inflatview_write/exec.c:3216:14
#100x55bb30fed387inaddress_space_write/exec.c:3308:18
0x603000045bc8is located 0 bytes to the right of 24-byte region [0x603000045bb0,0x603000045bc8) allocated by thread T0 here:
#00x55bb30f7111din malloc ()
#10x7fdae3d35500ing_malloc(/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x54500) #20x55bb30fd84d4inram_block_add/exec.c:2268:9
#30x55bb30fded16inqemu_ram_alloc_internal/exec.c:2441:5
#40x55bb30fdefedinqemu_ram_alloc/exec.c:2460:12
#50x55bb3195c0beinmemory_region_init_ram_shared_nomigrate/softmmu/memory.c:1515:21#60x55bb31cd6544inram_backend_memory_alloc/backends/hostmem-ram.c:30:5
#70x55bb31ccf875inhost_memory_backend_memory_complete/backends/hostmem.c:333:9#80x55bb3360737einuser_creatable_complete/qom/object_interfaces.c:23:9
#90x55bb31a44e59increate_default_memdev/softmmu/vl.c:2830:5
#100x55bb31a2d528inqemu_init/softmmu/vl.c:4352:9
#110x55bb3405390cinmain/softmmu/main.c:48:5Quoted 81 lines · Helge Deller
From: Sven Schnelle <[email protected]>
Signed-off-by Sven Schnelle <[email protected]>Signed-off-by Helge Deller <[email protected]>--- hw/display/artist.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)hw/display/artist.c +11
-14@@ -340,14 +340,13 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, {struct vram_buffer *buf;uint32_t vram_bitmask = s->vram_bitmask; -int mask, i, pix_count, pix_length, offset, height, width; +int mask, i, pix_count, pix_length, offset, width;uint8_t *data8, *p; pix_count =vram_write_pix_per_transfer (s); pix_length =vram_pixel_length (s); buf =vram_write_buffer (s); - height = buf->height; width = buf->width;if (s->cmap_bm_access) {@@ -367,13 +366,6 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, pix_count = size *8 ; } -if (posy * width + posx + pix_count > buf->size) { -qemu_log ("write outside bounds: wants %dx%d, max size %dx%d\n" , - posx, posy, width, height); -return ; - } - -switch (pix_length) {case 0 :if (s->image_bitmap_op &0x20000000 ) {@@ -381,8 +373,11 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, }for (i =0 ; i < pix_count; i++) { -artist_rop8 (s, p + offset + pix_count -1 - i, - (data &1 ) ? (s->plane_mask >>24 ) :0 ); +uint32_t off = offset + pix_count -1 - i; +if (off < buf->size) { +artist_rop8 (s, p + off, + (data &1 ) ? (s->plane_mask >>24 ) :0 ); + } data >>=1 ; }memory_region_set_dirty (&buf->mr, offset, pix_count);@@ -398,7 +393,10 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,for (i =3 ; i >=0 ; i--) {if (!(s->image_bitmap_op &0x20000000 ) || s->vram_bitmask & (1 << (28 + i))) { -artist_rop8 (s, p + offset +3 - i, data8[ROP8OFF (i)]); +uint32_t off = offset +3 - i; +if (off < buf->size) { +artist_rop8 (s, p + off, data8[ROP8OFF (i)]); + } } }memory_region_set_dirty (&buf->mr, offset,3 );@@ -420,7 +418,7 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,break ; } -for (i =0 ; i < pix_count; i++) { +for (i =0 ; i < pix_count && offset + i < buf->size; i++) { mask =1 << (pix_count -1 - i); if (!(s->image_bitmap_op & 0x20000000) || --2.21.3
Re: [PATCH v2 4/4] hw/display/artist.c: fix out of bounds check
Quoted 7 lines · Alexander Bulekov
Quoted 5 lines · Alexander Bulekov
Hi,
I applied this patch, but I can still trigger a segfault and heap overread throughartist_reg_write->fill_window. I dont know if these problems are related to what this patch fixes. If not, let me know and I can create a separate launchpad report for these.
Quoted 5 lines
And another one through
draw_line...
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none \
-qtest stdio -accel qtest
writeq0xf8100e020x4f4f4f4f4f939600
EOF
I missed that Phil already submitted a report here:
https://bugs.launchpad.net/qemu/+bug/1880326
and sent a patchset
https://patchwork.ozlabs.org/project/qemu-devel/list/?series=178879
Quoted 168 lines
==13563==ERROR: AddressSanitizer: SEGV on unknown address
0x7f3fe4d403fd(pc0x55ae401eb392bp0x7ffea90ca2d0sp0x7ffea90ca1e0T0) ==13563==The signal is caused by a READ memory access.#0 0x55ae401eb392 in artist_rop8 /hw/display/artist.c:284:14 #1 0x55ae401ee163 in draw_line /hw/display/artist.c:635:13 #2 0x55ae401e730a in draw_line_size /hw/display/artist.c:685:5 #3 0x55ae401db25d in artist_reg_write /hw/display/artist.c:917:9 #4 0x55ae3f8cd7a3 in memory_region_write_accessor /softmmu/memory.c:483:5 #5 0x55ae3f8ccadc in access_with_adjusted_size /softmmu/memory.c:539:18 #6 0x55ae3f8ca873 in memory_region_dispatch_write /softmmu/memory.c:1466:16 #7 0x55ae3ef78056 in flatview_write_continue /exec.c:3176:23 #8 0x55ae3ef60866 in flatview_write /exec.c:3216:14 #9 0x55ae3ef60387 in address_space_write /exec.c:3308:18 #10 0x55ae3f974604 in qtest_process_command /softmmu/qtest.c:452:13 #11 0x55ae3f96bc08 in qtest_process_inbuf /softmmu/qtest.c:710:9 #12 0x55ae3f96a895 in qtest_read /softmmu/qtest.c:722:5 #13 0x55ae41e262f3 in qemu_chr_be_write_impl /chardev/char.c:188:9 #14 0x55ae41e26477 in qemu_chr_be_write /chardev/char.c:200:9 #15 0x55ae41e3a763 in fd_chr_read /chardev/char-fd.c:68:9 #16 0x55ae41f8eb24 in qio_channel_fd_source_dispatch /io/channel-watch.c:84:12 #17 0x7f400f6cc897 in g_main_context_dispatch () #18 0x55ae42386a2b in glib_pollfds_poll /util/main-loop.c:217:9 #19 0x55ae4238415b in os_host_main_loop_wait /util/main-loop.c:240:5 #20 0x55ae42383af4 in main_loop_wait /util/main-loop.c:516:11 #21 0x55ae3f98cd00 in qemu_main_loop /softmmu/vl.c:1676:9 #22 0x55ae41fc6911 in main /softmmu/main.c:49:5Quoted 141 lines
-Alex
(1) Segfault:
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none \
-qtest stdio -accel qtest
writeq0xf8100a020x845c235c223f0584
EOFAddressSanitizer: SEGV on unknown address
0x7fa50235cc00
#00x555577f8b392inartist_rop8/hw/display/artist.c:284:14
#10x555577f84603infill_window/hw/display/artist.c:549:13
#20x555577f7abfcinartist_reg_write/hw/display/artist.c:895:9#30x55557766d7a3inmemory_region_write_accessor/softmmu/memory.c:483:5#40x55557766cadcinaccess_with_adjusted_size/softmmu/memory.c:539:18#50x55557766a873inmemory_region_dispatch_write/softmmu/memory.c:1466:16#60x555576d18056inflatview_write_continue/exec.c:3176:23
#70x555576d00866inflatview_write/exec.c:3216:14
#80x555576d00387inaddress_space_write/exec.c:3308:18
#90x555577714604inqtest_process_command/softmmu/qtest.c:452:13===========================================================
(2) Heap Overflow:
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none -m 64 \
-qtest stdio -accel qtest
writeq0xf8100a020x8cd00011900a0203
EOFAddressSanitizer: heap-buffer-overflow on address
0x603000045bc8at pc0x55bb3196f704bp0x7fff1c701d70sp0x7fff1c701d68READ of size 8 at0x603000045bc8thread T0#0
0x55bb3196f703incpu_physical_memory_set_dirty_range/include/exec/ram_addr.h:318:35#10x55bb3196e6f2inmemory_region_set_dirty/softmmu/memory.c:1994:5
#20x55bb32279bb6inartist_invalidate_lines/hw/display/artist.c:212:9
#30x55bb3227165dinfill_window/hw/display/artist.c:552:5
#40x55bb32267bfcinartist_reg_write/hw/display/artist.c:895:9
#50x55bb3195a7a3inmemory_region_write_accessor/softmmu/memory.c:483:5#60x55bb31959adcinaccess_with_adjusted_size/softmmu/memory.c:539:18
#70x55bb31957873inmemory_region_dispatch_write/softmmu/memory.c:1466:16#80x55bb31005056inflatview_write_continue/exec.c:3176:23
#90x55bb30fed866inflatview_write/exec.c:3216:14
#100x55bb30fed387inaddress_space_write/exec.c:3308:18
0x603000045bc8is located 0 bytes to the right of 24-byte region [0x603000045bb0,0x603000045bc8) allocated by thread T0 here:
#00x55bb30f7111din malloc ()
#10x7fdae3d35500ing_malloc(/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x54500) #20x55bb30fd84d4inram_block_add/exec.c:2268:9
#30x55bb30fded16inqemu_ram_alloc_internal/exec.c:2441:5
#40x55bb30fdefedinqemu_ram_alloc/exec.c:2460:12
#50x55bb3195c0beinmemory_region_init_ram_shared_nomigrate/softmmu/memory.c:1515:21#60x55bb31cd6544inram_backend_memory_alloc/backends/hostmem-ram.c:30:5
#70x55bb31ccf875inhost_memory_backend_memory_complete/backends/hostmem.c:333:9#80x55bb3360737einuser_creatable_complete/qom/object_interfaces.c:23:9
#90x55bb31a44e59increate_default_memdev/softmmu/vl.c:2830:5
#100x55bb31a2d528inqemu_init/softmmu/vl.c:4352:9
#110x55bb3405390cinmain/softmmu/main.c:48:5Quoted 81 lines · Helge Deller
From: Sven Schnelle <[email protected]>
Signed-off-by Sven Schnelle <[email protected]>Signed-off-by Helge Deller <[email protected]>--- hw/display/artist.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)hw/display/artist.c +11
-14@@ -340,14 +340,13 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, {struct vram_buffer *buf;uint32_t vram_bitmask = s->vram_bitmask; -int mask, i, pix_count, pix_length, offset, height, width; +int mask, i, pix_count, pix_length, offset, width;uint8_t *data8, *p; pix_count =vram_write_pix_per_transfer (s); pix_length =vram_pixel_length (s); buf =vram_write_buffer (s); - height = buf->height; width = buf->width;if (s->cmap_bm_access) {@@ -367,13 +366,6 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, pix_count = size *8 ; } -if (posy * width + posx + pix_count > buf->size) { -qemu_log ("write outside bounds: wants %dx%d, max size %dx%d\n" , - posx, posy, width, height); -return ; - } - -switch (pix_length) {case 0 :if (s->image_bitmap_op &0x20000000 ) {@@ -381,8 +373,11 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x, }for (i =0 ; i < pix_count; i++) { -artist_rop8 (s, p + offset + pix_count -1 - i, - (data &1 ) ? (s->plane_mask >>24 ) :0 ); +uint32_t off = offset + pix_count -1 - i; +if (off < buf->size) { +artist_rop8 (s, p + off, + (data &1 ) ? (s->plane_mask >>24 ) :0 ); + } data >>=1 ; }memory_region_set_dirty (&buf->mr, offset, pix_count);@@ -398,7 +393,10 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,for (i =3 ; i >=0 ; i--) {if (!(s->image_bitmap_op &0x20000000 ) || s->vram_bitmask & (1 << (28 + i))) { -artist_rop8 (s, p + offset +3 - i, data8[ROP8OFF (i)]); +uint32_t off = offset +3 - i; +if (off < buf->size) { +artist_rop8 (s, p + off, data8[ROP8OFF (i)]); + } } }memory_region_set_dirty (&buf->mr, offset,3 );@@ -420,7 +418,7 @@ static void vram_bit_write(ARTISTState *s, int posx, int posy, bool incr_x,break ; } -for (i =0 ; i < pix_count; i++) { +for (i =0 ; i < pix_count && offset + i < buf->size; i++) { mask =1 << (pix_count -1 - i); if (!(s->image_bitmap_op & 0x20000000) || --2.21.3
Re: [PATCH v2 4/4] hw/display/artist.c: fix out of bounds check
Quoted 14 lines · Alexander Bulekov
Quoted 7 lines · Alexander Bulekov
Quoted 5 lines · Alexander Bulekov
Hi,
I applied this patch, but I can still trigger a segfault and heap overread throughartist_reg_write->fill_window. I dont know if these problems are related to what this patch fixes. If not, let me know and I can create a separate launchpad report for these.Quoted 5 lines
And another one through
draw_line...
cat << EOF | ./hppa-softmmu/qemu-system-hppa -display none \
-qtest stdio -accel qtest
writeq0xf8100e020x4f4f4f4f4f939600
EOF
Quoted 5 lines
I missed that Phil already submitted a report here:
https://bugs.launchpad.net/qemu/+bug/1880326and sent a patchset
https://patchwork.ozlabs.org/project/qemu-devel/list/?series=178879
Alexander, thanks for finding the bugs, and, Phil, thanks for the patches!
I'll test & review it tomorrow and add into the pull request if Ok.
Helge
Quoted 4 lines
Quoted 4 lines
==13563==ERROR: AddressSanitizer: SEGV on unknown address
0x7f3fe4d403fd(pc0x55ae401eb392bp0x7ffea90ca2d0sp0x7ffea90ca1e0T0) ==13563==The signal is caused by a READ memory access.#0 0x55ae401eb392 in artist_rop8 /hw/display/artist.c:284:14
...
Quoted 3 lines · Helge Deller
A few late fixes for target-hppa:
* Fix the SeaBIOS-hppa firmware build with gcc-10 on Debian
It looks like you forgot the above change somehow. And me too, I forgot to send you a proper [PATCH] for this. This is what I use in Debian:
From: Michael Tokarev <[email protected]>
Subject: seabios-hppa: add -fno-ipa-sra to the compiler flags
Date: Wed, 22 Jul 2020 22:15:46 +0300
This allows seabios-hppa to build with gcc-10. Or else the compiler generates eg memset.isra.0 symbols instead of memset, and the final link step fails due to missing memset.
Previous versions of gcc, for quite some time already, recognizes this option but it does nothing since apparently no-ipa-sra is the default. So there's no harm in adding it unconditionally, it seems.
index c0d5d958..1b7757e8 100644
Makefile.parisc +1 -1
@@ -76 +76 @@ COMMONCFLAGS := -I$(OUT) -Isrc -Ivgasrc -Os -MD -g \ - -fno-builtin-printf + -fno-builtin-printf -fno-ipa-sra
This should not be required for the actual binary once it is built, however.
Thanks,
/mjt
Hi Michael,
Quoted 6 lines · Michael Tokarev
Quoted 3 lines · Helge Deller
A few late fixes for target-hppa:
* Fix the SeaBIOS-hppa firmware build with gcc-10 on Debian
It looks like you forgot the above change somehow.
Actually, no, I did not forgot this patch.
It's part of the seabios-hppa repo, see here:
https://github.com/hdeller/seabios-hppa/commit/14a26ffb0d9ad1fc510da5d03215b0e36f717fce
In this qemu patch series the binary firmware-hppa.img blob I sent was built with it.
Quoted 26 lines
And me too,
I forgot to send you a proper [PATCH] for this. This is what I use in Debian:From: Michael Tokarev <[email protected]>
Subject: seabios-hppa: add -fno-ipa-sra to the compiler flags
Date: Wed, 22 Jul 2020 22:15:46 +0300This allows seabios-hppa to build with gcc-10. Or else the compiler generates eg memset.isra.0 symbols instead of memset, and the final link step fails due to missing memset.
Previous versions of gcc, for quite some time already, recognizes this option but it does nothing since apparently no-ipa-sra is the default. So there's no harm in adding it unconditionally, it seems.
Signed-off-by Michael Tokarev <[email protected]>index
c0d5d958..1b7757e8100644Makefile.parisc +1
-1@@ -76 +76 @@ COMMONCFLAGS := -I$(OUT) -Isrc -Ivgasrc -Os -MD -g \ - -fno-builtin-printf + -fno-builtin-printf -fno-ipa-sra
Quoted 2 lines
This should not be required for the actual binary once it is built, however.
Yep.
Thanks!
Helge
Quoted 6 lines · Helge Deller
Hi Michael,
Quoted 3 lines · Michael Tokarev
Quoted 2 lines · Helge Deller
A few late fixes for target-hppa:
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
* Fix the SeaBIOS-hppa firmware build with gcc-10 on Debian
It looks like you forgot the above change somehow.
Actually, no, I did not forgot this patch.
It's part of the seabios-hppa repo, see here:
https://github.com/hdeller/seabios-hppa/commit/14a26ffb0d9ad1fc510da5d03215b0e36f717fce
Oh. Yeah, my bad, I thought that patch should be within the 4 changes of this series, while this series is about qemu, not the seabios-hppa sources. N/m :)
/mjt