mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
hvm/hpet: Correctly limit period to a maximum.
In the code section after the comment:
/*
* Clamp period to reasonable min/max values:
* - minimum is 100us, same as timers controlled by vpt.c
* - maximum is to prevent overflow in time_after() calculations
*/
The current maximum limit actually allows "bad" values like 0 and 1.
This is because it uses a mask not a maximum.
Signed-off-by: Don Slutz <dslutz@verizon.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Tim Deegan <tim@xen.org>
This commit is contained in:
1 parent
02c8401f0c
commit
825e70b1ec
1 file changed
+4
-1
@@ -404,6 +404,8 @@ static int hpet_write(
|
||||
if ( timer_is_periodic(h, tn) &&
|
||||
!(h->hpet.timers[tn].config & HPET_TN_SETVAL) )
|
||||
{
|
||||
uint64_t max_period = (timer_is_32bit(h, tn) ? ~0u : ~0ull) >> 1;
|
||||
|
||||
/*
|
||||
* Clamp period to reasonable min/max values:
|
||||
* - minimum is 100us, same as timers controlled by vpt.c
|
||||
@@ -411,7 +413,8 @@ static int hpet_write(
|
||||
*/
|
||||
if ( hpet_tick_to_ns(h, new_val) < MICROSECS(100) )
|
||||
new_val = (MICROSECS(100) << 10) / h->hpet_to_ns_scale;
|
||||
new_val &= (timer_is_32bit(h, tn) ? ~0u : ~0ull) >> 1;
|
||||
if ( new_val > max_period )
|
||||
new_val = max_period;
|
||||
h->hpet.period[tn] = new_val;
|
||||
}
|
||||
else
|
||||
|
||||