diff options
| author |   Laura Abbott <lauraa@codeaurora.org> | 2015-03-13 21:41:45 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2015-03-18 10:13:46 +0000 |
| commit | f2ca09f381a59e1eddb89aa70207740c2ee0fe94 (patch) | |
| tree | 3356b1a9d68463c95dccc9148f0585d99bfdaf5d /arch | |
| parent | ARM: 8310/1: l2c: Fix prefetch settings dt parsing (diff) | |
| download | linux-dev-f2ca09f381a59e1eddb89aa70207740c2ee0fe94.tar.xz linux-dev-f2ca09f381a59e1eddb89aa70207740c2ee0fe94.zip | |
ARM: 8311/1: 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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/pageattr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c index 004e35cdcfff..cf30daff8932 100644 --- a/arch/arm/mm/pageattr.c +++ b/arch/arm/mm/pageattr.c @@ -49,7 +49,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 || start >= MODULES_END) return -EINVAL; data.set_mask = set_mask; |