summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-07 22:31:17 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-07 22:31:17 +0300
commit9aae0df6a3cb6fbbfe30b1649644a862632fbfdd (patch)
tree999e79d19d14fe87eccb30fed512f4c976b35c41 /arch
parentaf13e867133a084aea536870ce39843e862c8aaa (diff)
parent168e47f2a6581fdbc5bb1845aeca1e50e2bc5c4b (diff)
downloadlinux-9aae0df6a3cb6fbbfe30b1649644a862632fbfdd.tar.xz
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas: "arm64 and generic kernel/module.c (acked by Rusty) fixes for CONFIG_DEBUG_SET_MODULE_RONX" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: kernel/module.c: Update debug alignment after symtable generation arm64: Don't use is_module_addr in setting page attributes
Diffstat (limited to 'arch')
-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;