[Xen-changelog] [xen stable-4.6] x86/MMCFG: don't ignore error from intercept handler

[patchbot@xxxxxxx]

commit 01022bbcf38117d7057a1300c01735091bc74cc0
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon May 9 12:55:18 2016 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon May 9 12:55:18 2016 +0200

    x86/MMCFG: don't ignore error from intercept handler
    
    In commit 9256f66c16 ("x86/PCI: intercept all PV Dom0 MMCFG writes")
    for an unclear to me reason I left pci_conf_write_intercept()'s return
    value unchecked. Correct this.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 5fe3abb574b319a8729d70d0b12e3a5b830dd66b
    master date: 2016-04-25 14:22:29 +0200
---
 xen/arch/x86/mm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index eed1efd..daf02ab 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -5346,11 +5346,11 @@ int mmcfg_intercept_write(
     }
 
     offset &= 0xfff;
-    pci_conf_write_intercept(mmio_ctxt->seg, mmio_ctxt->bdf, offset, bytes,
-                             p_data);
-    pci_mmcfg_write(mmio_ctxt->seg, PCI_BUS(mmio_ctxt->bdf),
-                    PCI_DEVFN2(mmio_ctxt->bdf), offset, bytes,
-                    *(uint32_t *)p_data);
+    if ( pci_conf_write_intercept(mmio_ctxt->seg, mmio_ctxt->bdf,
+                                  offset, bytes, p_data) >= 0 )
+        pci_mmcfg_write(mmio_ctxt->seg, PCI_BUS(mmio_ctxt->bdf),
+                        PCI_DEVFN2(mmio_ctxt->bdf), offset, bytes,
+                        *(uint32_t *)p_data);
 
     return X86EMUL_OKAY;
 }
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog