[Xen-changelog] [xen staging-4.9] x86/HVM: __hvm_copy() should not write to p2m_ioreq_server pages

[patchbot@xxxxxxx]

commit ed4f0e839399e84f5a73a97208179f1810bb37e9
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Feb 1 12:00:45 2019 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Feb 1 12:00:45 2019 +0100

    x86/HVM: __hvm_copy() should not write to p2m_ioreq_server pages
    
    Commit 3bdec530a5 ("x86/HVM: split page straddling emulated accesses in
    more cases") introduced a hvm_copy_to_guest_linear() attempt before
    falling back to hvmemul_linear_mmio_write(). This is wrong for the
    p2m_ioreq_server special case. That change widened a pre-existing issue
    though: Other writes to such pages also need to be failed (or forced
    through emulation), in particular hypercall buffer writes.
    
    Reported-by: Igor Druzhinin <igor.druzhinin@xxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: d7bff2bc003cd5fd8c618b70c62b8fcfd9cd187e
    master date: 2018-11-15 16:42:25 +0100
---
 xen/arch/x86/hvm/hvm.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index e319227a54..7495d249c4 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -3165,6 +3165,12 @@ static enum hvm_copy_result __hvm_copy(
             return HVMCOPY_unhandleable;
         }
 
+        if ( (flags & HVMCOPY_to_guest) && p2mt == p2m_ioreq_server )
+        {
+            put_page(page);
+            return HVMCOPY_bad_gfn_to_mfn;
+        }
+
         p = (char *)__map_domain_page(page) + (addr & ~PAGE_MASK);
 
         if ( flags & HVMCOPY_to_guest )
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.9

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog