]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
hv: don't reset hv_context.tsc_page on crash
authorVitaly Kuznetsov <vkuznets@redhat.com>
Wed, 7 Dec 2016 09:16:27 +0000 (01:16 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Jan 2017 20:46:40 +0000 (21:46 +0100)
It may happen that secondary CPUs are still alive and resetting
hv_context.tsc_page will cause a consequent crash in read_hv_clock_tsc()
as we don't check for it being not NULL there. It is safe as we're not
freeing this page anyways.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hv/hv.c

index 13937563c9dbdd19f04935233caaf708beade322..fbd8ce6d7ff38b9aee342e784acefc43d1112038 100644 (file)
@@ -309,9 +309,10 @@ void hv_cleanup(bool crash)
 
                hypercall_msr.as_uint64 = 0;
                wrmsrl(HV_X64_MSR_REFERENCE_TSC, hypercall_msr.as_uint64);
-               if (!crash)
+               if (!crash) {
                        vfree(hv_context.tsc_page);
-               hv_context.tsc_page = NULL;
+                       hv_context.tsc_page = NULL;
+               }
        }
 #endif
 }