[PATCH 3/6] arm64: Don't use is_module_addr in setting page attributes

Paolo Pisati paolo.pisati at canonical.com
Mon Mar 30 16:36:04 UTC 2015


From: Laura Abbott <lauraa at codeaurora.org>

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 at codeaurora.org>
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
(cherry picked from commit 8b5f5a073fda33bbe96b3eb1bffca32010ccaf0e)
Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 arch/arm64/mm/pageattr.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index bb0ea94..1d3ec3d 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;
-- 
2.1.4





More information about the kernel-team mailing list