diff options
| -rw-r--r-- | xen/common/domain.c | 3 | ||||
| -rw-r--r-- | xen/include/xen/time.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/xen/common/domain.c b/xen/common/domain.c index ab41187d79..ef3d6f8db3 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -823,6 +823,9 @@ long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE(void) arg) if ( set.period_ns < MILLISECS(1) ) return -EINVAL; + if ( set.period_ns > STIME_DELTA_MAX ) + return -EINVAL; + v->periodic_period = set.period_ns; vcpu_force_reschedule(v); diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index 38ead92755..7f29ed1d58 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -52,6 +52,8 @@ struct tm gmtime(unsigned long t); #define MILLISECS(_ms) ((s_time_t)((_ms) * 1000000ULL)) #define MICROSECS(_us) ((s_time_t)((_us) * 1000ULL)) #define STIME_MAX ((s_time_t)((uint64_t)~0ull>>1)) +/* Chosen so (NOW() + delta) wont overflow without an uptime of 200 years */ +#define STIME_DELTA_MAX ((s_time_t)((uint64_t)~0ull>>2)) extern void update_vcpu_system_time(struct vcpu *v); extern void update_domain_wallclock_time(struct domain *d); |