diff options
| author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2016-12-07 12:16:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 08:41:49 +0300 |
| commit | 664f72a17f2c072175a0083388f315f811ff1acb (patch) | |
| tree | 1917e3846e85241fbaf7b8cc3a010cffe22a9567 /drivers/hv | |
| parent | 6e936b06795ae5dcb5248e0c4344d8303de4c2db (diff) | |
| download | linux-664f72a17f2c072175a0083388f315f811ff1acb.tar.xz | |
hv: don't reset hv_context.tsc_page on crash
commit 56ef6718a1d8d77745033c5291e025ce18504159 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
| -rw-r--r-- | drivers/hv/hv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index a2567a4be1a8..6e49a4dd99c0 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -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 } |