Appropriately mask out the address and flags parameters when constructing a pte

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/include/arch/x86/pagetable.h b/include/arch/x86/pagetable.h
index aa5ab82b529e4cef5058c4cb3c88e025641bc699..4e7b9a3d1524a248249fc273f5d00f0b15f9fc63 100644 (file)
--- a/include/arch/x86/pagetable.h
+++ b/include/arch/x86/pagetable.h
@@ -12,7 +12,8 @@ static inline paddr_t pte_to_paddr(intpte_t pte)
 
 static inline intpte_t pte_from_paddr(paddr_t paddr, uint64_t flags)
 {
-    return paddr | flags;
+    return ((paddr &  (PADDR_MASK & PAGE_MASK)) |
+            (flags & ~(PADDR_MASK & PAGE_MASK)));
 }
 
 static inline intpte_t pte_from_gfn(unsigned long gfn, uint64_t flags)