Unverified Commit d5c3ef07 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13213 CVE-2024-47745 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OLGPHPSV2ZXKR7IEO56VQH3AUH3JG3BQ/ 
CVE-2024-47745.

Kirill A. Shutemov (1):
  mm: split critical region in remap_file_pages() and invoke LSMs in
    between

Liam Howlett (1):
  mm/mmap.c: don't unlock VMAs in remap_file_pages()

Shu Han (1):
  mm: call the security_mmap_file() LSM hook in remap_file_pages()


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IAYQSE 
 
Link:https://gitee.com/openeuler/kernel/pulls/13213

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents a81d020c 35acf8a0

mm/mmap.c

+57 −29
Original line number Diff line number Diff line
@@ -3203,6 +3203,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, 
	unsigned long populate = 0;

	unsigned long ret = -EINVAL;

	struct file *file;

	vm_flags_t vm_flags;



	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",

		     current->comm, current->pid);
@@ -3219,17 +3220,70 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, 
	if (pgoff + (size >> PAGE_SHIFT) < pgoff)

		return ret;



	if (down_write_killable(&mm->mmap_sem))

	if (down_read_killable(&mm->mmap_sem))

		return -EINTR;



	/*

	 * Look up VMA under read lock first so we can perform the security

	 * without holding locks (which can be problematic). We reacquire a

	 * write lock later and check nothing changed underneath us.

	 */

	vma = find_vma(mm, start);



	if (!vma || !(vma->vm_flags & VM_SHARED))

	if (!vma || !(vma->vm_flags & VM_SHARED)) {

		up_read(&mm->mmap_sem);

		return -EINVAL;

	}



	if (start < vma->vm_start) {

		up_read(&mm->mmap_sem);

		return -EINVAL;

	}



	prot |= vma->vm_flags & VM_READ ? PROT_READ : 0;

	prot |= vma->vm_flags & VM_WRITE ? PROT_WRITE : 0;

	prot |= vma->vm_flags & VM_EXEC ? PROT_EXEC : 0;



	flags &= MAP_NONBLOCK;

	flags |= MAP_SHARED | MAP_FIXED | MAP_POPULATE;

	if (vma->vm_flags & VM_LOCKED)

		flags |= MAP_LOCKED;



	/* Save vm_flags used to calculate prot and flags, and recheck later. */

	vm_flags = vma->vm_flags;

	file = get_file(vma->vm_file);



	up_read(&mm->mmap_sem);



	/* Call outside mmap_lock to be consistent with other callers. */

	ret = security_mmap_file(file, prot, flags);

	if (ret) {

		fput(file);

		return ret;

	}



	ret = -EINVAL;



	/* OK security check passed, take write lock + let it rip. */

	if (down_write_killable(&mm->mmap_sem)) {

		fput(file);

		return -EINTR;

	}



	vma = find_vma(mm, start);



	if (!vma)

		goto out;



	if (start < vma->vm_start)

		goto out;



	/* Make sure things didn't change under us. */

	if (vma->vm_flags != vm_flags)

		goto out;

	if (vma->vm_file != file)

		goto out;



	if (start + size > vma->vm_end) {

		struct vm_area_struct *next;
@@ -3252,37 +3306,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, 
			goto out;

	}



	prot |= vma->vm_flags & VM_READ ? PROT_READ : 0;

	prot |= vma->vm_flags & VM_WRITE ? PROT_WRITE : 0;

	prot |= vma->vm_flags & VM_EXEC ? PROT_EXEC : 0;



	flags &= MAP_NONBLOCK;

	flags |= MAP_SHARED | MAP_FIXED | MAP_POPULATE;

	if (vma->vm_flags & VM_LOCKED) {

		struct vm_area_struct *tmp;

		flags |= MAP_LOCKED;



		/* drop PG_Mlocked flag for over-mapped range */

		for (tmp = vma; tmp->vm_start >= start + size;

				tmp = tmp->vm_next) {

			/*

			 * Split pmd and munlock page on the border

			 * of the range.

			 */

			vma_adjust_trans_huge(tmp, start, start + size, 0);



			munlock_vma_pages_range(tmp,

					max(tmp->vm_start, start),

					min(tmp->vm_end, start + size));

		}

	}



	file = get_file(vma->vm_file);

	ret = do_mmap_pgoff(vma->vm_file, start, size,

			prot, flags, pgoff, &populate, NULL);

	fput(file);

out:

	up_write(&mm->mmap_sem);

	fput(file);

	if (populate)

		mm_populate(ret, populate);

	if (!IS_ERR_VALUE(ret))