Commit 7be202c5 authored by Wang Wensheng's avatar Wang Wensheng
Browse files

mm/sharepool: Protect the va reserved for sharepool 

ascend inclusion
category: Feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8LNGH



---------------------------------------------

Add protections for the va reserved for sharepool. Forbid mremap/munmap
to access that range.

Signed-off-by: default avatarWang Wensheng <wangwensheng4@huawei.com>
parent cda50cb2

include/linux/share_pool.h

+20 −0
Original line number Diff line number Diff line
@@ -154,6 +154,16 @@ static inline void sp_init_mm(struct mm_struct *mm) 
	mm->sp_group_master = NULL;

}



static inline bool sp_check_addr(unsigned long addr)

{

	return sp_is_enabled() && mg_is_sharepool_addr(addr);

}



static inline bool sp_check_mmap_addr(unsigned long addr, unsigned long flags)

{

	return sp_is_enabled() && mg_is_sharepool_addr(addr) && !(flags & MAP_SHARE_POOL);

}



#else /* CONFIG_SHARE_POOL */



static inline int mg_sp_group_add_task(int tgid, unsigned long prot, int spg_id)
@@ -242,6 +252,16 @@ static inline bool sp_check_vm_share_pool(unsigned long vm_flags) 
{

	return false;

}



static inline bool sp_check_addr(unsigned long addr)

{

	return false;

}



static inline bool sp_check_mmap_addr(unsigned long addr, unsigned long flags)

{

	return false;

}

#endif /* !CONFIG_SHARE_POOL */



#endif /* LINUX_SHARE_POOL_H */

mm/mmap.c

+9 −0
Original line number Diff line number Diff line
@@ -1720,6 +1720,9 @@ generic_get_unmapped_area(struct file *filp, unsigned long addr, 
	if (len > mmap_end - mmap_min_addr)

		return -ENOMEM;



	if (sp_check_mmap_addr(addr, flags))

		return -EINVAL;



	if (flags & MAP_FIXED)

		return addr;
@@ -1769,6 +1772,9 @@ generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr, 
	if (len > mmap_end - mmap_min_addr)

		return -ENOMEM;



	if (sp_check_mmap_addr(addr, flags))

		return -EINVAL;



	if (flags & MAP_FIXED)

		return addr;
@@ -2949,6 +2955,9 @@ static int __vm_munmap(unsigned long start, size_t len, bool unlock) 
	LIST_HEAD(uf);

	VMA_ITERATOR(vmi, mm, start);



	if (sp_check_addr(start))

		return -EINVAL;



	if (mmap_write_lock_killable(mm))

		return -EINTR;

mm/mremap.c

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/uaccess.h>

#include <linux/userfaultfd_k.h>

#include <linux/mempolicy.h>

#include <linux/share_pool.h>



#include <asm/cacheflush.h>

#include <asm/tlb.h>
@@ -948,6 +949,9 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, 
	if (offset_in_page(addr))

		return ret;



	if (sp_check_addr(addr) || sp_check_addr(new_addr))

		return ret;



	old_len = PAGE_ALIGN(old_len);

	new_len = PAGE_ALIGN(new_len);