linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] lib/ioremap.c: avoid endless loop under ioremapping page unaligned ranges
@ 2016-09-21  4:19 zijun_hu
  2016-09-22 12:47 ` Michal Hocko
                   ` (2 more replies)
  0 siblings, 3 replies; 15+ messages in thread
From: zijun_hu @ 2016-09-21  4:19 UTC (permalink / raw)
  To: Andrew Morton
  Cc: linux-mm, linux-kernel, zijun_hu, tj, mingo, rientjes,
	iamjoonsoo.kim, mgorman

From: zijun_hu <zijun_hu@htc.com>

endless loop maybe happen if either of parameter addr and end is not
page aligned for kernel API function ioremap_page_range()

in order to fix this issue and alert improper range parameters to user
WARN_ON() checkup and rounding down range lower boundary are performed
firstly, loop end condition within ioremap_pte_range() is optimized due
to lack of relevant macro pte_addr_end()

Signed-off-by: zijun_hu <zijun_hu@htc.com>
---
 lib/ioremap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ioremap.c b/lib/ioremap.c
index 86c8911..911bdca 100644
--- a/lib/ioremap.c
+++ b/lib/ioremap.c
@@ -64,7 +64,7 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long addr,
 		BUG_ON(!pte_none(*pte));
 		set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot));
 		pfn++;
-	} while (pte++, addr += PAGE_SIZE, addr != end);
+	} while (pte++, addr += PAGE_SIZE, addr < end && addr >= PAGE_SIZE);
 	return 0;
 }
 
@@ -129,7 +129,9 @@ int ioremap_page_range(unsigned long addr,
 	int err;
 
 	BUG_ON(addr >= end);
+	WARN_ON(!PAGE_ALIGNED(addr) || !PAGE_ALIGNED(end));
 
+	addr = round_down(addr, PAGE_SIZE);
 	start = addr;
 	phys_addr -= addr;
 	pgd = pgd_offset_k(addr);
-- 
1.9.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2016-09-23 16:23 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-21  4:19 [PATCH 1/1] lib/ioremap.c: avoid endless loop under ioremapping page unaligned ranges zijun_hu
2016-09-22 12:47 ` Michal Hocko
2016-09-22 15:13   ` zijun_hu
2016-09-23  8:45     ` Michal Hocko
2016-09-23 12:29       ` zijun_hu
2016-09-23 12:42         ` Michal Hocko
2016-09-23 13:00           ` zijun_hu
2016-09-23 13:33             ` Michal Hocko
2016-09-23 14:14               ` zijun_hu
2016-09-23 14:27                 ` Michal Hocko
2016-09-23 14:58                   ` zijun_hu
2016-09-23  5:53 ` [PATCH v2 " zijun_hu
2016-09-23 14:42 ` [PATCH " Tejun Heo
2016-09-23 15:41   ` zijun_hu
2016-09-23 16:23     ` Tejun Heo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).