diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2013-06-10 18:31:11 +0200 |
|---|---|---|
| committer | Kamal Mostafa <kamal@canonical.com> | 2013-06-25 15:08:23 -0700 |
| commit | 0a3387fd602f90aa2692cae49735155b9fb87233 (patch) | |
| tree | e9327eec6bbdc634d5ea3194b16039f3fbdf76ef /arch | |
| parent | efe27189544f45b567d59bea30a2cab3b7529557 (diff) | |
x86: kvmclock: zero initialize pvclock shared memory area
commit 07868fc6aaf57847b0f3a3d53086b7556eb83f4a upstream.
kernel might hung in pvclock_clocksource_read() due to
uninitialized memory might contain odd version value in
following cycle:
do {
version = __pvclock_read_cycles(src, &ret, &flags);
} while ((src->version & 1) || version != src->version);
if secondary kvmclock is accessed before it's registered with kvm.
Clear garbage in pvclock shared memory area right after it's
allocated to avoid this issue.
Ref: https://bugzilla.kernel.org/show_bug.cgi?id=59521
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
[See BZ for analysis. We may want a different fix for 3.11, but
this is the safest for now - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 5bedbdddf1f2..a855a2e3a07e 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -238,6 +238,7 @@ void __init kvmclock_init(void) if (!mem) return; hv_clock = __va(mem); + memset(hv_clock, 0, size); if (kvm_register_clock("boot clock")) { hv_clock = NULL; |