summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <lauraa@codeaurora.org>2015-02-25 23:14:55 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2015-03-06 13:04:22 +0100
commit8b5f5a073fda33bbe96b3eb1bffca32010ccaf0e (patch)
tree655d442547f62b686977bc7e4f1772a26a87b79b
parentLinux 4.0-rc2 (diff)
downloadlinux-8b5f5a073fda33bbe96b3eb1bffca32010ccaf0e.tar.xz
linux-8b5f5a073fda33bbe96b3eb1bffca32010ccaf0e.zip
arm64: Don't use is_module_addr in setting page attributes
The set_memory_* functions currently only support module addresses. The addresses are validated using is_module_addr. That function is special though and relies on internal state in the module subsystem to work properly. At the time of module initialization and calling set_memory_*, it's too early for is_module_addr to work properly so it always returns false. Rather than be subject to the whims of the module state, just bounds check against the module virtual address range. Signed-off-by: Laura Abbott <lauraa@codeaurora.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--arch/arm64/mm/pageattr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index bb0ea94c4ba1..1d3ec3ddd84b 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -51,7 +51,10 @@ static int change_memory_common(unsigned long addr, int numpages,
WARN_ON_ONCE(1);
}
- if (!is_module_address(start) || !is_module_address(end - 1))
+ if (start < MODULES_VADDR || start >= MODULES_END)
+ return -EINVAL;
+
+ if (end < MODULES_VADDR || end >= MODULES_END)
return -EINVAL;
data.set_mask = set_mask;