UBUNTU SAUCE: arm: mm: avoid calling apply_to_page_range on empty range

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: <stable@vger.kernel.org>
Reviewed-by: Laura Abbott <labbott@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Mika Penttilä <mika.penttila@nextfour.com>
BugLink: http://bugs.launchpad.net/bugs/1547718
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c
index cf30daff8932504f95422c2aa3b5882b154713b5..4e5937945efd3d014fc0c85f21b1b96dd2906e82 100644 (file)
--- a/arch/arm/mm/pageattr.c
+++ b/arch/arm/mm/pageattr.c
@@ -55,6 +55,9 @@ static int change_memory_common(unsigned long addr, int numpages,
        if (end < MODULES_VADDR || start >= MODULES_END)
                return -EINVAL;
 
+       if (!numpages)
+               return 0;
+
        data.set_mask = set_mask;
        data.clear_mask = clear_mask;