1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 15e9b57e9cf0..43b9bfea48fa 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -782,7 +782,11 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain,
         int offset;
 
         BUG_ON(!domain->pgd);
-        BUG_ON(addr_width < BITS_PER_LONG && pfn >> addr_width);
+
+        if (addr_width < BITS_PER_LONG && pfn >> addr_width)
+                /* Address beyond IOMMU's addressing capabilities. */
+                return NULL;
+
         parent = domain->pgd;
 
         while (level > 0) {
@@ -3777,11 +3781,10 @@ static void iommu_detach_dependent_devices(struct intel_iommu *iommu,
 static void domain_remove_one_dev_info(struct dmar_domain *domain,
                                           struct pci_dev *pdev)
 {
-        struct device_domain_info *info;
+        struct device_domain_info *info, *tmp;
         struct intel_iommu *iommu;
         unsigned long flags;
         int found = 0;
-        struct list_head *entry, *tmp;
 
         iommu = device_to_iommu(pci_domain_nr(pdev->bus), pdev->bus->number,
                                 pdev->devfn);
@@ -3789,8 +3792,7 @@ static void domain_remove_one_dev_info(struct dmar_domain *domain,
                 return;
 
         spin_lock_irqsave(&device_domain_lock, flags);
-        list_for_each_safe(entry, tmp, &domain->devices) {
-                info = list_entry(entry, struct device_domain_info, link);
+        list_for_each_entry_safe(info, tmp, &domain->devices, link) {
                 if (info->segment == pci_domain_nr(pdev->bus) &&
                     info->bus == pdev->bus->number &&
                     info->devfn == pdev->devfn) {