Commit 228e4183 authored by Daniel Jordan's avatar Daniel Jordan Committed by Xie XiuQi
Browse files

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: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Signed-off-by: default avatarHongbo Yao <yaohongbo@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Tested-by: default avatarHongbo Yao <yaohongbo@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 22705b26

mm/internal.h

+4 −3
Original line number Diff line number Diff line
@@ -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;