| Message ID | 20250224205053.104959-1-pierrick.bouvier@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/misc/npcm_clk: fix buffer-overflow | expand |
Thanks! On Mon, Feb 24, 2025 at 12:51 PM Pierrick Bouvier < pierrick.bouvier@linaro.org> wrote: > Regression introduced by cf76c4 > (hw/misc: Add nr_regs and cold_reset_values to NPCM CLK) > > cold_reset_values has a different size, depending on device used > (NPCM7xx vs NPCM8xx). However, s->regs has a fixed size, which matches > NPCM8xx. Thus, when initializing a NPCM7xx, we go past cold_reset_values > ending. > > Report by asan: > ==2066==ERROR: AddressSanitizer: global-buffer-overflow on address > 0x55d68a3e97f0 at pc 0x7fcaf2b2d14b bp 0x7ffff0cc3890 sp 0x7ffff0cc3040 > READ of size 196 at 0x55d68a3e97f0 thread T0 > #0 0x7fcaf2b2d14a in __interceptor_memcpy > ../../../../src/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:827 > #1 0x55d688447e0d in memcpy > /usr/include/x86_64-linux-gnu/bits/string_fortified.h:29 > #2 0x55d688447e0d in npcm_clk_enter_reset ../hw/misc/npcm_clk.c:968 > #3 0x55d6899b7213 in resettable_phase_enter ../hw/core/resettable.c:136 > #4 0x55d6899a1ef7 in bus_reset_child_foreach ../hw/core/bus.c:97 > #5 0x55d6899b717d in resettable_child_foreach > ../hw/core/resettable.c:92 > #6 0x55d6899b717d in resettable_phase_enter ../hw/core/resettable.c:129 > #7 0x55d6899b4ead in resettable_container_child_foreach > ../hw/core/resetcontainer.c:54 > #8 0x55d6899b717d in resettable_child_foreach > ../hw/core/resettable.c:92 > #9 0x55d6899b717d in resettable_phase_enter ../hw/core/resettable.c:129 > #10 0x55d6899b7bfa in resettable_assert_reset > ../hw/core/resettable.c:55 > #11 0x55d6899b8666 in resettable_reset ../hw/core/resettable.c:45 > #12 0x55d688d15cd2 in qemu_system_reset ../system/runstate.c:527 > #13 0x55d687fc5edd in qdev_machine_creation_done > ../hw/core/machine.c:1738 > #14 0x55d688d209bd in qemu_machine_creation_done ../system/vl.c:2779 > #15 0x55d688d209bd in qmp_x_exit_preconfig ../system/vl.c:2807 > #16 0x55d688d281fb in qemu_init ../system/vl.c:3838 > #17 0x55d687ceab12 in main ../system/main.c:68 > #18 0x7fcaef006249 (/lib/x86_64-linux-gnu/libc.so.6+0x27249) > #19 0x7fcaef006304 in __libc_start_main > (/lib/x86_64-linux-gnu/libc.so.6+0x27304) > #20 0x55d687cf0010 in _start > (/home/runner/work/qemu-ci/qemu-ci/build/qemu-system-arm+0x371c010) > > 0x55d68a3e97f0 is located 0 bytes to the right of global variable > 'npcm7xx_cold_reset_values' defined in '../hw/misc/npcm_clk.c:134:23' > (0x55d68a3e9780) of size 112 > > Impacted tests: > Summary of Failures: > > check: > 2/747 qemu:qtest+qtest-aarch64 / qtest-aarch64/qom-test > ERROR 9.28s killed by signal 6 SIGABRT > 4/747 qemu:qtest+qtest-arm / qtest-arm/qom-test > ERROR 7.82s killed by signal 6 SIGABRT > 32/747 qemu:qtest+qtest-aarch64 / qtest-aarch64/device-introspect-test > ERROR 10.91s killed by signal 6 SIGABRT > 35/747 qemu:qtest+qtest-arm / qtest-arm/device-introspect-test > ERROR 11.33s killed by signal 6 SIGABRT > 114/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_pwm-test > ERROR 0.98s killed by signal 6 SIGABRT > 115/747 qemu:qtest+qtest-aarch64 / qtest-aarch64/test-hmp > ERROR 2.95s killed by signal 6 SIGABRT > 117/747 qemu:qtest+qtest-arm / qtest-arm/test-hmp > ERROR 2.54s killed by signal 6 SIGABRT > 151/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_watchdog_timer-test > ERROR 0.96s killed by signal 6 SIGABRT > 247/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_adc-test > ERROR 0.96s killed by signal 6 SIGABRT > 248/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_gpio-test > ERROR 1.05s killed by signal 6 SIGABRT > 249/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_rng-test > ERROR 0.97s killed by signal 6 SIGABRT > 250/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_sdhci-test > ERROR 0.97s killed by signal 6 SIGABRT > 251/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_smbus-test > ERROR 0.89s killed by signal 6 SIGABRT > 252/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_timer-test > ERROR 1.09s killed by signal 6 SIGABRT > 253/747 qemu:qtest+qtest-arm / qtest-arm/npcm_gmac-test > ERROR 1.12s killed by signal 6 SIGABRT > 255/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_emc-test > ERROR 1.05s killed by signal 6 SIGABRT > > check-functional: > 22/203 qemu:func-thorough+func-arm-thorough+thorough / > func-arm-arm_quanta_gsj ERROR 0.79s exit > status 1 > 38/203 qemu:func-quick+func-aarch64 / func-aarch64-migration > ERROR 1.97s exit status 1 > 45/203 qemu:func-quick+func-arm / func-arm-migration > ERROR 1.90s exit status 1 > > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > Reviewed-by: Hao Wu <wuhaotsh@google.com> > --- > hw/misc/npcm_clk.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/misc/npcm_clk.c b/hw/misc/npcm_clk.c > index d1f29759d59..0e85974cf96 100644 > --- a/hw/misc/npcm_clk.c > +++ b/hw/misc/npcm_clk.c > @@ -964,8 +964,9 @@ static void npcm_clk_enter_reset(Object *obj, > ResetType type) > NPCMCLKState *s = NPCM_CLK(obj); > NPCMCLKClass *c = NPCM_CLK_GET_CLASS(s); > > - g_assert(sizeof(s->regs) >= c->nr_regs * sizeof(uint32_t)); > - memcpy(s->regs, c->cold_reset_values, sizeof(s->regs)); > + size_t sizeof_regs = c->nr_regs * sizeof(uint32_t); > + g_assert(sizeof(s->regs) >= sizeof_regs); > + memcpy(s->regs, c->cold_reset_values, sizeof_regs); > s->ref_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); > npcm7xx_clk_update_all_clocks(s); > /* > -- > 2.39.5 > >
On Mon, 24 Feb 2025 at 20:51, Pierrick Bouvier <pierrick.bouvier@linaro.org> wrote: > > Regression introduced by cf76c4 > (hw/misc: Add nr_regs and cold_reset_values to NPCM CLK) > > cold_reset_values has a different size, depending on device used > (NPCM7xx vs NPCM8xx). However, s->regs has a fixed size, which matches > NPCM8xx. Thus, when initializing a NPCM7xx, we go past cold_reset_values > ending. > diff --git a/hw/misc/npcm_clk.c b/hw/misc/npcm_clk.c > index d1f29759d59..0e85974cf96 100644 > --- a/hw/misc/npcm_clk.c > +++ b/hw/misc/npcm_clk.c > @@ -964,8 +964,9 @@ static void npcm_clk_enter_reset(Object *obj, ResetType type) > NPCMCLKState *s = NPCM_CLK(obj); > NPCMCLKClass *c = NPCM_CLK_GET_CLASS(s); > > - g_assert(sizeof(s->regs) >= c->nr_regs * sizeof(uint32_t)); > - memcpy(s->regs, c->cold_reset_values, sizeof(s->regs)); > + size_t sizeof_regs = c->nr_regs * sizeof(uint32_t); > + g_assert(sizeof(s->regs) >= sizeof_regs); > + memcpy(s->regs, c->cold_reset_values, sizeof_regs); > s->ref_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); > npcm7xx_clk_update_all_clocks(s); > /* Whoops, thanks for catching this. Applied to target-arm.next, thanks. (Looking more closely at the cold_reset_values handling in npcm_gcr.c, that looks not quite right in a different way; I'll send a reply to that patch email about that.) -- PMM
On 2/25/25 05:41, Peter Maydell wrote: > On Mon, 24 Feb 2025 at 20:51, Pierrick Bouvier > <pierrick.bouvier@linaro.org> wrote: >> >> Regression introduced by cf76c4 >> (hw/misc: Add nr_regs and cold_reset_values to NPCM CLK) >> >> cold_reset_values has a different size, depending on device used >> (NPCM7xx vs NPCM8xx). However, s->regs has a fixed size, which matches >> NPCM8xx. Thus, when initializing a NPCM7xx, we go past cold_reset_values >> ending. > > >> diff --git a/hw/misc/npcm_clk.c b/hw/misc/npcm_clk.c >> index d1f29759d59..0e85974cf96 100644 >> --- a/hw/misc/npcm_clk.c >> +++ b/hw/misc/npcm_clk.c >> @@ -964,8 +964,9 @@ static void npcm_clk_enter_reset(Object *obj, ResetType type) >> NPCMCLKState *s = NPCM_CLK(obj); >> NPCMCLKClass *c = NPCM_CLK_GET_CLASS(s); >> >> - g_assert(sizeof(s->regs) >= c->nr_regs * sizeof(uint32_t)); >> - memcpy(s->regs, c->cold_reset_values, sizeof(s->regs)); >> + size_t sizeof_regs = c->nr_regs * sizeof(uint32_t); >> + g_assert(sizeof(s->regs) >= sizeof_regs); >> + memcpy(s->regs, c->cold_reset_values, sizeof_regs); >> s->ref_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); >> npcm7xx_clk_update_all_clocks(s); >> /* > > Whoops, thanks for catching this. Applied to target-arm.next, thanks. > > (Looking more closely at the cold_reset_values handling > in npcm_gcr.c, that looks not quite right in a different > way; I'll send a reply to that patch email about that.) > It may be a hole in our CI right now. Would that be interesting for CI to run all tests (check-functional + check w/o functional) with both ubsan and asan? > -- PMM
diff --git a/hw/misc/npcm_clk.c b/hw/misc/npcm_clk.c index d1f29759d59..0e85974cf96 100644 --- a/hw/misc/npcm_clk.c +++ b/hw/misc/npcm_clk.c @@ -964,8 +964,9 @@ static void npcm_clk_enter_reset(Object *obj, ResetType type) NPCMCLKState *s = NPCM_CLK(obj); NPCMCLKClass *c = NPCM_CLK_GET_CLASS(s); - g_assert(sizeof(s->regs) >= c->nr_regs * sizeof(uint32_t)); - memcpy(s->regs, c->cold_reset_values, sizeof(s->regs)); + size_t sizeof_regs = c->nr_regs * sizeof(uint32_t); + g_assert(sizeof(s->regs) >= sizeof_regs); + memcpy(s->regs, c->cold_reset_values, sizeof_regs); s->ref_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); npcm7xx_clk_update_all_clocks(s); /*
Regression introduced by cf76c4 (hw/misc: Add nr_regs and cold_reset_values to NPCM CLK) cold_reset_values has a different size, depending on device used (NPCM7xx vs NPCM8xx). However, s->regs has a fixed size, which matches NPCM8xx. Thus, when initializing a NPCM7xx, we go past cold_reset_values ending. Report by asan: ==2066==ERROR: AddressSanitizer: global-buffer-overflow on address 0x55d68a3e97f0 at pc 0x7fcaf2b2d14b bp 0x7ffff0cc3890 sp 0x7ffff0cc3040 READ of size 196 at 0x55d68a3e97f0 thread T0 #0 0x7fcaf2b2d14a in __interceptor_memcpy ../../../../src/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:827 #1 0x55d688447e0d in memcpy /usr/include/x86_64-linux-gnu/bits/string_fortified.h:29 #2 0x55d688447e0d in npcm_clk_enter_reset ../hw/misc/npcm_clk.c:968 #3 0x55d6899b7213 in resettable_phase_enter ../hw/core/resettable.c:136 #4 0x55d6899a1ef7 in bus_reset_child_foreach ../hw/core/bus.c:97 #5 0x55d6899b717d in resettable_child_foreach ../hw/core/resettable.c:92 #6 0x55d6899b717d in resettable_phase_enter ../hw/core/resettable.c:129 #7 0x55d6899b4ead in resettable_container_child_foreach ../hw/core/resetcontainer.c:54 #8 0x55d6899b717d in resettable_child_foreach ../hw/core/resettable.c:92 #9 0x55d6899b717d in resettable_phase_enter ../hw/core/resettable.c:129 #10 0x55d6899b7bfa in resettable_assert_reset ../hw/core/resettable.c:55 #11 0x55d6899b8666 in resettable_reset ../hw/core/resettable.c:45 #12 0x55d688d15cd2 in qemu_system_reset ../system/runstate.c:527 #13 0x55d687fc5edd in qdev_machine_creation_done ../hw/core/machine.c:1738 #14 0x55d688d209bd in qemu_machine_creation_done ../system/vl.c:2779 #15 0x55d688d209bd in qmp_x_exit_preconfig ../system/vl.c:2807 #16 0x55d688d281fb in qemu_init ../system/vl.c:3838 #17 0x55d687ceab12 in main ../system/main.c:68 #18 0x7fcaef006249 (/lib/x86_64-linux-gnu/libc.so.6+0x27249) #19 0x7fcaef006304 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x27304) #20 0x55d687cf0010 in _start (/home/runner/work/qemu-ci/qemu-ci/build/qemu-system-arm+0x371c010) 0x55d68a3e97f0 is located 0 bytes to the right of global variable 'npcm7xx_cold_reset_values' defined in '../hw/misc/npcm_clk.c:134:23' (0x55d68a3e9780) of size 112 Impacted tests: Summary of Failures: check: 2/747 qemu:qtest+qtest-aarch64 / qtest-aarch64/qom-test ERROR 9.28s killed by signal 6 SIGABRT 4/747 qemu:qtest+qtest-arm / qtest-arm/qom-test ERROR 7.82s killed by signal 6 SIGABRT 32/747 qemu:qtest+qtest-aarch64 / qtest-aarch64/device-introspect-test ERROR 10.91s killed by signal 6 SIGABRT 35/747 qemu:qtest+qtest-arm / qtest-arm/device-introspect-test ERROR 11.33s killed by signal 6 SIGABRT 114/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_pwm-test ERROR 0.98s killed by signal 6 SIGABRT 115/747 qemu:qtest+qtest-aarch64 / qtest-aarch64/test-hmp ERROR 2.95s killed by signal 6 SIGABRT 117/747 qemu:qtest+qtest-arm / qtest-arm/test-hmp ERROR 2.54s killed by signal 6 SIGABRT 151/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_watchdog_timer-test ERROR 0.96s killed by signal 6 SIGABRT 247/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_adc-test ERROR 0.96s killed by signal 6 SIGABRT 248/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_gpio-test ERROR 1.05s killed by signal 6 SIGABRT 249/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_rng-test ERROR 0.97s killed by signal 6 SIGABRT 250/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_sdhci-test ERROR 0.97s killed by signal 6 SIGABRT 251/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_smbus-test ERROR 0.89s killed by signal 6 SIGABRT 252/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_timer-test ERROR 1.09s killed by signal 6 SIGABRT 253/747 qemu:qtest+qtest-arm / qtest-arm/npcm_gmac-test ERROR 1.12s killed by signal 6 SIGABRT 255/747 qemu:qtest+qtest-arm / qtest-arm/npcm7xx_emc-test ERROR 1.05s killed by signal 6 SIGABRT check-functional: 22/203 qemu:func-thorough+func-arm-thorough+thorough / func-arm-arm_quanta_gsj ERROR 0.79s exit status 1 38/203 qemu:func-quick+func-aarch64 / func-aarch64-migration ERROR 1.97s exit status 1 45/203 qemu:func-quick+func-arm / func-arm-migration ERROR 1.90s exit status 1 Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> --- hw/misc/npcm_clk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)