Commit 3c424f35 authored Jan 26, 2012 by Pawel Moll Committed by Russell King Jan 27, 2012

ARM: 7304/1: ioremap: fix boundary check when reusing static mapping



Since commit 576d2f25 "ARM: add
generic ioremap optimization by reusing static mappings" ioremap()
is trying to reuse existing static mapping when possible.

The condition checking boundaries of the requested and existing
mappings didn't take in-page offset into consideration though,
which lead to obscure and hard to debug problems when requested
mapping crossed end of the static one.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 9a95b9e7

arch/arm/mm/ioremap.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -225,7 +225,8 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
		if ((area->flags & VM_ARM_MTYPE_MASK) != VM_ARM_MTYPE(mtype))
		continue;
		if (__phys_to_pfn(area->phys_addr) > pfn \|\|
		__pfn_to_phys(pfn) + size-1 > area->phys_addr + area->size-1)
		__pfn_to_phys(pfn) + offset + size-1 >
		area->phys_addr + area->size-1)
		continue;
		/* we can drop the lock here as we know area is static /
		read_unlock(&vmlist_lock);

Admin message