Skip to content

Commit 9de6741

Browse files
ZheyuMaPatchew Applier
authored and
Patchew Applier
committed
hw/display/sm501: Validate local memory size index in sm501_system_config_write
Ensure that the local_mem_size_index is within valid bounds and does not exceed the allocated memory size before updating it in sm501_system_config_write to prevent out-of-bounds read. ASAN log: ==3067247==ERROR: AddressSanitizer: global-buffer-overflow on address 0x55c6586e4d3c at pc 0x55c655d4e0ac bp 0x7ffc9d5c6a10 sp 0x7ffc9d5c6a08 READ of size 4 at 0x55c6586e4d3c thread T0 #0 0x55c655d4e0ab in sm501_2d_operation qemu/hw/display/sm501.c:729:21 #1 0x55c655d4b8a1 in sm501_2d_engine_write qemu/hw/display/sm501.c:1551:13 Reproducer: cat << EOF | qemu-system-x86_64 \ -display none -machine accel=qtest, -m 512M -machine q35 -nodefaults \ -device sm501 -qtest stdio outl 0xcf8 0x80000814 outl 0xcfc 0xe4000000 outl 0xcf8 0x80000804 outw 0xcfc 0x02 writel 0xe4000010 0xe000 writel 0xe4100010 0x10000 writel 0xe4100008 0x10001 writel 0xe410000c 0x80000000 EOF Signed-off-by: Zheyu Ma <[email protected]> Message-Id: <[email protected]>
1 parent 1a2d52c commit 9de6741

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

hw/display/sm501.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,11 +1020,21 @@ static void sm501_system_config_write(void *opaque, hwaddr addr,
10201020
s->gpio_63_32_control = value & 0xFF80FFFF;
10211021
break;
10221022
case SM501_DRAM_CONTROL:
1023-
s->local_mem_size_index = (value >> 13) & 0x7;
1024-
/* TODO : check validity of size change */
1023+
{
1024+
int local_mem_size_index = (value >> 13) & 0x7;
1025+
if (local_mem_size_index < ARRAY_SIZE(sm501_mem_local_size) &&
1026+
sm501_mem_local_size[local_mem_size_index] <=
1027+
memory_region_size(&s->local_mem_region)) {
1028+
s->local_mem_size_index = local_mem_size_index;
1029+
} else {
1030+
qemu_log_mask(LOG_GUEST_ERROR,
1031+
"sm501: Invalid local_mem_size_index value: %d or memory size too large\n",
1032+
local_mem_size_index);
1033+
}
10251034
s->dram_control &= 0x80000000;
10261035
s->dram_control |= value & 0x7FFFFFC3;
10271036
break;
1037+
}
10281038
case SM501_ARBTRTN_CONTROL:
10291039
s->arbitration_control = value & 0x37777777;
10301040
break;

0 commit comments

Comments
 (0)