5c0f7d38a6
reverse-24757-use-grant-references.patch - fate#313222 - xenstore-chmod should support 256 permissions 26189-xenstore-chmod.patch - bnc#789945 - VUL-0: CVE-2012-5510: xen: Grant table version switch list corruption vulnerability (XSA-26) CVE-2012-5510-xsa26.patch - bnc#789944 - VUL-0: CVE-2012-5511: xen: Several HVM operations do not validate the range of their inputs (XSA-27) CVE-2012-5511-xsa27.patch - bnc#789951 - VUL-0: CVE-2012-5513: xen: XENMEM_exchange may overwrite hypervisor memory (XSA-29) CVE-2012-5513-xsa29.patch - bnc#789948 - VUL-0: CVE-2012-5514: xen: Missing unlock in guest_physmap_mark_populate_on_demand() (XSA-30) CVE-2012-5514-xsa30.patch - bnc#789950 - VUL-0: CVE-2012-5515: xen: Several memory hypercall operations allow invalid extent order values (XSA-31) CVE-2012-5515-xsa31.patch - bnc#789952 - VUL-0: CVE-2012-5525: xen: Several hypercalls do not validate input GFNs (XSA-32) CVE-2012-5525-xsa32.patch - Upstream patches from Jan 26129-ACPI-BGRT-invalidate.patch 26132-tmem-save-NULL-check.patch 26134-x86-shadow-invlpg-check.patch 26139-cpumap-masking.patch 26148-vcpu-timer-overflow.patch (Replaces CVE-2012-4535-xsa20.patch) OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=219
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
References: CVE-2012-4535 XSA-20 bnc#786516
|
|
|
|
# HG changeset patch
|
|
# User Ian Jackson <Ian.Jackson@eu.citrix.com>
|
|
# Date 1352892634 0
|
|
# Node ID bf58b94b3cef4db8d9ad9c8686bf10910ccc0644
|
|
# Parent 3186c04af5829a242059ffe4f6427853b7bfc408
|
|
VCPU/timers: Prevent overflow in calculations, leading to DoS vulnerability
|
|
|
|
The timer action for a vcpu periodic timer is to calculate the next
|
|
expiry time, and to reinsert itself into the timer queue. If the
|
|
deadline ends up in the past, Xen never leaves __do_softirq(). The
|
|
affected PCPU will stay in an infinite loop until Xen is killed by the
|
|
watchdog (if enabled).
|
|
|
|
This is a security problem, XSA-20 / CVE-2012-4535.
|
|
|
|
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
|
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
|
|
--- a/xen/common/domain.c
|
|
+++ b/xen/common/domain.c
|
|
@@ -882,6 +882,9 @@ long do_vcpu_op(int cmd, int vcpuid, XEN
|
|
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);
|
|
|
|
--- a/xen/include/xen/time.h
|
|
+++ b/xen/include/xen/time.h
|
|
@@ -55,6 +55,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);
|