Skip to content

Commit

Permalink
hv: don't reset hv_context.tsc_page on crash
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vitaly Kuznetsov authored and Greg Kroah-Hartman committed Jan 10, 2017
1 parent 3c7630d commit 56ef671
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/hv/hv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 56ef671

Please sign in to comment.