diff mbox series

[v3,for-4.4,7/7] hv: don't reset hv_context.tsc_page on crash

Message ID 1492673923-1352-8-git-send-email-sumit.semwal@linaro.org
State New
Headers show
Series hv patches for 4.4.y (resubmit) | expand

Commit Message

Sumit Semwal April 20, 2017, 7:38 a.m. UTC 
From: Vitaly Kuznetsov <vkuznets@redhat.com>


[ Upstream commit 56ef6718a1d8d77745033c5291e025ce18504159 ]

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>

Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>

---
 drivers/hv/hv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.7.4
diff mbox series

Patch

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index ddbf7e7..8ce1f2e 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -305,9 +305,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
 }