[Xen-changelog] [xen stable-4.2] AMD IOMMU: don't BUG() when we don't have to

[patchbot@xxxxxxx]

commit 1eb4d2bee7109005e850bef502b317c7a41a7784
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Feb 22 13:45:28 2013 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Feb 22 13:45:28 2013 +0100

    AMD IOMMU: don't BUG() when we don't have to
    
    find_iommu_for_device() can easily return NULL instead, as all of its
    callers are prepared for that.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    master changeset: f547d42ec0306cdceffb8f7603c7e6f8977cf398
    master date: 2013-02-18 09:37:35 +0100
---
 xen/drivers/passthrough/amd/pci_amd_iommu.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c 
b/xen/drivers/passthrough/amd/pci_amd_iommu.c
index 78389fc..2955cf0 100644
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
@@ -32,8 +32,8 @@ struct amd_iommu *find_iommu_for_device(int seg, int bdf)
 {
     struct ivrs_mappings *ivrs_mappings = get_ivrs_mappings(seg);
 
-    BUG_ON ( bdf >= ivrs_bdf_entries );
-    return ivrs_mappings ? ivrs_mappings[bdf].iommu : NULL;
+    return ivrs_mappings && bdf < ivrs_bdf_entries ? ivrs_mappings[bdf].iommu
+                                                   : NULL;
 }
 
 /*
--
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