Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c924aff8 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Fix BUG()s in ioremap() code 



We need to ensure that the area size is page aligned so that
remap_area_pte() doesn't increment the address past the end of
the desired area.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5a059f1a

arch/arm/mm/ioremap.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -292,6 +292,8 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, 
	if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))

	if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))

		return NULL;

		return NULL;





	size = PAGE_ALIGN(size);



 	area = get_vm_area(size, VM_IOREMAP);

 	area = get_vm_area(size, VM_IOREMAP);

 	if (!area)

 	if (!area)

 		return NULL;

 		return NULL;