[xen staging-4.18] x86/EPT: correct special page checking in epte_get_entry_emt()

[patchbot@xxxxxxx]

commit 6e647efaf2b02ce92bcf80bec47c18cca5084f8a
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Jun 26 13:39:44 2024 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Jun 26 13:39:44 2024 +0200

    x86/EPT: correct special page checking in epte_get_entry_emt()
    
    mfn_valid() granularity is (currently) 256Mb. Therefore the start of a
    1Gb page passing the test doesn't necessarily mean all parts of such a
    range would also pass. Yet using the result of mfn_to_page() on an MFN
    which doesn't pass mfn_valid() checking is liable to result in a crash
    (the invocation of mfn_to_page() alone is presumably "just" UB in such a
    case).
    
    Fixes: ca24b2ffdbd9 ("x86/hvm: set 'ipat' in EPT for special pages")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    master commit: 5540b94e8191059eb9cbbe98ac316232a42208f6
    master date: 2024-06-13 16:53:34 +0200
---
 xen/arch/x86/mm/p2m-ept.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c
index 85c4e8e54f..1aa6bbc771 100644
--- a/xen/arch/x86/mm/p2m-ept.c
+++ b/xen/arch/x86/mm/p2m-ept.c
@@ -518,8 +518,12 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t 
mfn,
     }
 
     for ( special_pgs = i = 0; i < (1ul << order); i++ )
-        if ( is_special_page(mfn_to_page(mfn_add(mfn, i))) )
+    {
+        mfn_t cur = mfn_add(mfn, i);
+
+        if ( mfn_valid(cur) && is_special_page(mfn_to_page(cur)) )
             special_pgs++;
+    }
 
     if ( special_pgs )
     {
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.18