Skip to content

Commit

Permalink
ARM: 8311/1: Don't use is_module_addr in setting page attributes
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Russell King <[email protected]>
  • Loading branch information
labbott authored and Russell King committed Mar 18, 2015
1 parent 5c95ed4 commit f2ca09f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/arm/mm/pageattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f2ca09f

Please sign in to comment.