From: Christian König <christian.koenig@amd.com>
Date: Wed, 29 Nov 2017 14:12:27 +0000 (+0100)
Subject: x86/PCI: Fix infinite loop in search for 64bit BAR placement
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=470195f82e4ea550b7c37736a12bf3fa565295ea;p=linux.git

x86/PCI: Fix infinite loop in search for 64bit BAR placement

Break the loop if we can't find some address space for a 64bit BAR.

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index 1e996df687a3b..5328e86f73eb9 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -696,8 +696,13 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev)
 	res->end = 0xfd00000000ull - 1;
 
 	/* Just grab the free area behind system memory for this */
-	while ((conflict = request_resource_conflict(&iomem_resource, res)))
+	while ((conflict = request_resource_conflict(&iomem_resource, res))) {
+		if (conflict->end >= res->end) {
+			kfree(res);
+			return;
+		}
 		res->start = conflict->end + 1;
+	}
 
 	dev_info(&dev->dev, "adding root bus resource %pR\n", res);