From 228e4183a3ed127f638368be88cde3d22e418865 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Wed, 14 Aug 2019 11:10:16 +0800 Subject: [PATCH] mm: enlarge type of offset argument in mem_map_offset and mem_map_next hulk inclusion category: feature bugzilla: 13228 CVE: NA --------------------------- Changes the type of 'offset' from int to unsigned long in both mem_map_offset and mem_map_next. This facilitates ktask's use of mem_map_next with its unsigned long types to avoid silent truncation when these unsigned longs are passed as ints. It also fixes the preexisting truncation of 'offset' from unsigned long to int by the sole caller of mem_map_offset, follow_hugetlb_page. Signed-off-by: Daniel Jordan Signed-off-by: Hongbo Yao Reviewed-by: Xie XiuQi Tested-by: Hongbo Yao Signed-off-by: Yang Yingliang --- mm/internal.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index ca41b400b4e6..cd4cf59ff310 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -366,7 +366,8 @@ static inline void mlock_migrate_page(struct page *new, struct page *old) { } * the maximally aligned gigantic page 'base'. Handle any discontiguity * in the mem_map at MAX_ORDER_NR_PAGES boundaries. */ -static inline struct page *mem_map_offset(struct page *base, int offset) +static inline struct page *mem_map_offset(struct page *base, + unsigned long offset) { if (unlikely(offset >= MAX_ORDER_NR_PAGES)) return nth_page(base, offset); @@ -377,8 +378,8 @@ static inline struct page *mem_map_offset(struct page *base, int offset) * Iterator over all subpages within the maximally aligned gigantic * page 'base'. Handle any discontiguity in the mem_map. */ -static inline struct page *mem_map_next(struct page *iter, - struct page *base, int offset) +static inline struct page *mem_map_next(struct page *iter, struct page *base, + unsigned long offset) { if (unlikely((offset & (MAX_ORDER_NR_PAGES - 1)) == 0)) { unsigned long pfn = page_to_pfn(base) + offset; -- GitLab