[Xen-changelog] [xen stable-4.2] AMD IOMMU: add missing check

[patchbot@xxxxxxx]

commit 3b5ca240edb5300fedc0a29c1b839984bdbbc89c
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Sep 6 14:49:38 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Sep 6 14:49:38 2013 +0200

    AMD IOMMU: add missing check
    
    We shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit
    we support (MAX_IO_APICS, currently 128).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Suravee Suthikulpanit <suravee.suthikulapanit@xxxxxxx>
    master commit: 3785d30efe8264b899499e0883b10cc434bd0959
    master date: 2013-08-29 09:31:37 +0200
---
 xen/drivers/passthrough/amd/iommu_acpi.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c 
b/xen/drivers/passthrough/amd/iommu_acpi.c
index 2b52ea9..2c23646 100644
--- a/xen/drivers/passthrough/amd/iommu_acpi.c
+++ b/xen/drivers/passthrough/amd/iommu_acpi.c
@@ -677,6 +677,13 @@ static u16 __init parse_ivhd_device_special(
         if ( IO_APIC_ID(apic) != special->handle )
             continue;
 
+        if ( special->handle >= ARRAY_SIZE(ioapic_sbdf) )
+        {
+            printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n",
+                   special->handle);
+            return 0;
+        }
+
         if ( ioapic_sbdf[special->handle].pin_setup )
         {
             if ( ioapic_sbdf[special->handle].bdf == bdf &&
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

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