x86: kvmclock: zero initialize pvclock shared memory area
authorIgor Mammedov <[email protected]>
Mon, 10 Jun 2013 16:31:11 +0000 (18:31 +0200)
committerPaolo Bonzini <[email protected]>
Wed, 19 Jun 2013 10:25:28 +0000 (12:25 +0200)
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 <[email protected]>
[See BZ for analysis.  We may want a different fix for 3.11, but
 this is the safest for now - Paolo]
Cc: <[email protected]> # 3.8
Signed-off-by: Paolo Bonzini <[email protected]>
arch/x86/kernel/kvmclock.c

index d2c381280e3cfd1a3b462ab0d43320f424e1e7bc..3dd37ebd591b36db493d449506d33a6b8915841f 100644 (file)
@@ -242,6 +242,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;