summaryrefslogtreecommitdiffstats
path: root/drivers/hv/hv.c
diff options
context:
space:
mode:
authorVitaly Kuznetsov <vkuznets@redhat.com>2016-12-07 01:16:27 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-10 21:46:40 +0100
commit56ef6718a1d8d77745033c5291e025ce18504159 (patch)
tree6a8a35252d19385144e617cdaebafb971c5fd94e /drivers/hv/hv.c
parent3c7630d35009e6635e5b58d62de554fd5b6db5df (diff)
downloadlinux-stable-56ef6718a1d8d77745033c5291e025ce18504159.tar.gz
linux-stable-56ef6718a1d8d77745033c5291e025ce18504159.tar.bz2
linux-stable-56ef6718a1d8d77745033c5291e025ce18504159.zip
hv: don't reset hv_context.tsc_page on crash
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>
Diffstat (limited to 'drivers/hv/hv.c')
-rw-r--r--drivers/hv/hv.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 13937563c9db..fbd8ce6d7ff3 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
}