From: Jan H. Schönherr <jschoenh@amazon.de>
Date: Sat, 20 Jan 2018 00:27:54 +0000 (-0800)
Subject: mm: Fix memory size alignment in devm_memremap_pages_release()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=10a0cd6e4932b5078215b1ec2c896597eec0eff9;p=openwrt%2Fstaging%2Fblogic.git

mm: Fix memory size alignment in devm_memremap_pages_release()

The functions devm_memremap_pages() and devm_memremap_pages_release() use
different ways to calculate the section-aligned amount of memory. The
latter function may use an incorrect size if the memory region is small
but straddles a section border.

Use the same code for both.

Cc: <stable@vger.kernel.org>
Fixes: 5f29a77cd957 ("mm: fix mixed zone detection in devm_memremap_pages")
Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/kernel/memremap.c b/kernel/memremap.c
index ada31b0d76d4..4ef97525a4ff 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -293,7 +293,8 @@ static void devm_memremap_pages_release(void *data)
 
 	/* pages are dead and unused, undo the arch mapping */
 	align_start = res->start & ~(SECTION_SIZE - 1);
-	align_size = ALIGN(resource_size(res), SECTION_SIZE);
+	align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE)
+		- align_start;
 
 	mem_hotplug_begin();
 	arch_remove_memory(align_start, align_size, pgmap->altmap_valid ?