Skip to content

Commit

Permalink
arm64: mm: avoid calling apply_to_page_range on empty range
Browse files Browse the repository at this point in the history
Calling apply_to_page_range with an empty range results in a BUG_ON
from the core code. This can be triggered by trying to load the st_drv
module with CONFIG_DEBUG_SET_MODULE_RONX enabled:

  kernel BUG at mm/memory.c:1874!
  Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
  Modules linked in:
  CPU: 3 PID: 1764 Comm: insmod Not tainted 4.5.0-rc1+ #2
  Hardware name: ARM Juno development board (r0) (DT)
  task: ffffffc9763b8000 ti: ffffffc975af8000 task.ti: ffffffc975af8000
  PC is at apply_to_page_range+0x2cc/0x2d0
  LR is at change_memory_common+0x80/0x108

This patch fixes the issue by making change_memory_common (called by the
set_memory_* functions) a NOP when numpages == 0, therefore avoiding the
erroneous call to apply_to_page_range and bringing us into line with x86
and s390.

Cc: <[email protected]>
Reviewed-by: Laura Abbott <[email protected]>
Acked-by: David Rientjes <[email protected]>
Signed-off-by: Mika Penttilä <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
  • Loading branch information
Mika Penttilä authored and wildea01 committed Jan 26, 2016
1 parent 531d306 commit 57adec8
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/arm64/mm/pageattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ static int change_memory_common(unsigned long addr, int numpages,
if (end < MODULES_VADDR || end >= MODULES_END)
return -EINVAL;

if (!numpages)
return 0;

data.set_mask = set_mask;
data.clear_mask = clear_mask;

Expand Down

0 comments on commit 57adec8

Please sign in to comment.