From: Dexuan Cui <decui@microsoft.com>
Date: Tue, 7 May 2019 07:46:55 +0000 (+0000)
Subject: Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE
X-Git-Tag: v5.3-rc6~12^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a9fc4340aee041dd186d1fb8f1b5d1e9caf28212;p=tomoyo%2Ftomoyo-test1.git

Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE

In the case of X86_PAE, unsigned long is u32, but the physical address type
should be u64. Due to the bug here, the netvsc driver can not load
successfully, and sometimes the VM can panic due to memory corruption (the
hypervisor writes data to the wrong location).

Fixes: 6ba34171bcbd ("Drivers: hv: vmbus: Remove use of slow_virt_to_phys()")
Cc: stable@vger.kernel.org
Cc: Michael Kelley <mikelley@microsoft.com>
Reported-and-tested-by: Juliana Rodrigueiro <juliana.rodrigueiro@intra2net.com>
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Reviewed-by:  Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 5f9505a087f6..23f358cb7f49 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -26,7 +26,7 @@
 
 static unsigned long virt_to_hvpfn(void *addr)
 {
-	unsigned long paddr;
+	phys_addr_t paddr;
 
 	if (is_vmalloc_addr(addr))
 		paddr = page_to_phys(vmalloc_to_page(addr)) +