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

hpet: fix clamping of period

Browse Source 
When writing a new period, the clamping should use a maximum value
rather tyhan a bit mask.  Also, when writing the high bits new_val
is shifted right by 32, so the maximum allowed period should also
be shifted right.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
2024-07-10 11:56:35 +02:00
parent de12ebfdab
commit c9669d6d57
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hw/timer/hpet.c
View File

@@ -548,7 +548,9 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
* FIXME: Clamp period to reasonable min value? * FIXME: Clamp period to reasonable min value?
* Clamp period to reasonable max value * Clamp period to reasonable max value
*/ */
new_val &= (timer->config & HPET_TN_32BIT ? ~0u : ~0ull) >> 1; if (timer->config & HPET_TN_32BIT) {
new_val = MIN(new_val, ~0u >> 1);
}
timer->period = timer->period =
(timer->period & 0xffffffff00000000ULL) | new_val; (timer->period & 0xffffffff00000000ULL) | new_val;
} }
@@ -567,7 +569,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
* FIXME: Clamp period to reasonable min value? * FIXME: Clamp period to reasonable min value?
* Clamp period to reasonable max value * Clamp period to reasonable max value
*/ */
new_val &= (timer->config & HPET_TN_32BIT ? ~0u : ~0ull) >> 1; new_val = MIN(new_val, ~0u >> 1);
timer->period = timer->period =
(timer->period & 0xffffffffULL) | new_val << 32; (timer->period & 0xffffffffULL) | new_val << 32;
} }