Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2018-11-01 16:18:27 +0100
committerBorislav Petkov <bp@suse.de>2018-11-01 16:18:44 +0100
commit7705c3b800985221802f6815cf7da32b8603c7f9 (patch)
tree717cbfdb22ba0cae2e315880df0fe918619e3581
parentd0cb1417228282b0e99e138347e5cef4eb637aa1 (diff)
resource: Include resource end in walk_*() interfaces
(bsc#1114279).
-rw-r--r--patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch79
-rw-r--r--series.conf1
2 files changed, 80 insertions, 0 deletions
diff --git a/patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch b/patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch
new file mode 100644
index 0000000000..540e6de955
--- /dev/null
+++ b/patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch
@@ -0,0 +1,79 @@
+From: Bjorn Helgaas <bhelgaas@google.com>
+Date: Thu, 27 Sep 2018 09:22:02 -0500
+Subject: resource: Include resource end in walk_*() interfaces
+Git-commit: a98959fdbda1849a01b2150bb635ed559ec06700
+Patch-mainline: v4.20-rc1
+References: bsc#1114279
+
+find_next_iomem_res() finds an iomem resource that covers part of a range
+described by "start, end". All callers expect that range to be inclusive,
+i.e., both start and end are included, but find_next_iomem_res() doesn't
+handle the end address correctly.
+
+If it finds an iomem resource that contains exactly the end address, it
+skips it, e.g., if "start, end" is [0x0-0x10000] and there happens to be an
+iomem resource [mem 0x10000-0x10000] (the single byte at 0x10000), we skip
+it:
+
+ find_next_iomem_res(...)
+ {
+ start = 0x0;
+ end = 0x10000;
+ for (p = next_resource(...)) {
+ # p->start = 0x10000;
+ # p->end = 0x10000;
+ # we *should* return this resource, but this condition is false:
+ if ((p->end >= start) && (p->start < end))
+ break;
+
+Adjust find_next_iomem_res() so it allows a resource that includes the
+single byte at the end of the range. This is a corner case that we
+probably don't see in practice.
+
+Fixes: 58c1b5b07907 ("[PATCH] memory hotadd fixes: find_next_system_ram catch range fix")
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+CC: Andrew Morton <akpm@linux-foundation.org>
+CC: Brijesh Singh <brijesh.singh@amd.com>
+CC: Dan Williams <dan.j.williams@intel.com>
+CC: H. Peter Anvin <hpa@zytor.com>
+CC: Lianbo Jiang <lijiang@redhat.com>
+CC: Takashi Iwai <tiwai@suse.de>
+CC: Thomas Gleixner <tglx@linutronix.de>
+CC: Tom Lendacky <thomas.lendacky@amd.com>
+CC: Vivek Goyal <vgoyal@redhat.com>
+CC: Yaowei Bai <baiyaowei@cmss.chinamobile.com>
+CC: bhe@redhat.com
+CC: dan.j.williams@intel.com
+CC: dyoung@redhat.com
+CC: kexec@lists.infradead.org
+CC: mingo@redhat.com
+CC: x86-ml <x86@kernel.org>
+Link: http://lkml.kernel.org/r/153805812254.1157.16736368485811773752.stgit@bhelgaas-glaptop.roam.corp.google.com
+---
+ kernel/resource.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kernel/resource.c b/kernel/resource.c
+index 30e1bc68503b..155ec873ea4d 100644
+--- a/kernel/resource.c
++++ b/kernel/resource.c
+@@ -319,7 +319,7 @@ int release_resource(struct resource *old)
+ EXPORT_SYMBOL(release_resource);
+
+ /*
+- * Finds the lowest iomem resource existing within [res->start.res->end).
++ * Finds the lowest iomem resource existing within [res->start..res->end].
+ * The caller must specify res->start, res->end, res->flags, and optionally
+ * desc. If found, returns 0, res is overwritten, if not found, returns -1.
+ * This function walks the whole tree and not just first level children until
+@@ -352,7 +352,7 @@ static int find_next_iomem_res(struct resource *res, unsigned long desc,
+ p = NULL;
+ break;
+ }
+- if ((p->end >= start) && (p->start < end))
++ if ((p->end >= start) && (p->start <= end))
+ break;
+ }
+
+
diff --git a/series.conf b/series.conf
index d6cc23de5a..feb64ef53d 100644
--- a/series.conf
+++ b/series.conf
@@ -18211,6 +18211,7 @@
patches.drivers/spi-bcm63xx-hsspi-keep-pll-clk-enabled.patch
patches.drivers/ACPI-processor-Fix-the-return-value-of-acpi_processo.patch
patches.arch/x86-kexec-correct-kexec_backup_src_end-off-by-one-error.patch
+ patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch
patches.drivers/iwlwifi-mvm-send-BCAST-management-frames-to-the-righ.patch
patches.drivers/iwlwifi-dbg-don-t-crash-if-the-firmware-crashes-in-t.patch
patches.drivers/iwlwifi-pcie-gen2-build-A-MSDU-only-for-GSO.patch