Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c36a09c authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Dennis Cagle
Browse files

mm: avoid setting up anonymous pages into file mapping 



Reading page fault handler code I've noticed that under right
circumstances kernel would map anonymous pages into file mappings: if
the VMA doesn't have vm_ops->fault() and the VMA wasn't fully populated
on ->mmap(), kernel would handle page fault to not populated pte with
do_anonymous_page().

Let's change page fault handler to use do_anonymous_page() only on
anonymous VMA (->vm_ops == NULL) and make sure that the VMA is not
shared.

For file mappings without vm_ops->fault() or shred VMA without vm_ops,
page fault on pte_none() entry would lead to SIGBUS.

Change-Id: I009546fba24e76be86f7de2e411e0be72145812f
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Willy Tarreau <w@1wt.eu>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
[d-cagle@codeaurora.org: Resolve trivial merge conflicts]
Git-repo: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git


Git-commit: 6b7339f4c31ad69c8e9c0b2859276e22cf72176d
Signed-off-by: default avatarDennis Cagle <d-cagle@codeaurora.org>
parent 6fe43690

mm/memory.c

+13 −7
Original line number Diff line number Diff line
@@ -2630,6 +2630,10 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, 


	pte_unmap(page_table);



	/* File mapping without ->vm_ops ? */

	if (vma->vm_flags & VM_SHARED)

		return VM_FAULT_SIGBUS;



	/* Check if we need to add a guard page to the stack */

	if (check_stack_guard_page(vma, address) < 0)

		return VM_FAULT_SIGSEGV;
@@ -3034,6 +3038,9 @@ static int do_linear_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
			- vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;



	pte_unmap(page_table);

	/* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */

	if (!vma->vm_ops->fault)

		return VM_FAULT_SIGBUS;

	if (!(flags & FAULT_FLAG_WRITE))

		return do_read_fault(mm, vma, address, pmd, pgoff, flags,

				orig_pte);
@@ -3199,13 +3206,12 @@ static int handle_pte_fault(struct mm_struct *mm, 
	entry = ACCESS_ONCE(*pte);

	if (!pte_present(entry)) {

		if (pte_none(entry)) {

			if (vma->vm_ops) {

				if (likely(vma->vm_ops->fault))

					return do_linear_fault(mm, vma, address,

						pte, pmd, flags, entry);

			}

			return do_anonymous_page(mm, vma, address,

						 pte, pmd, flags);

			if (vma->vm_ops)

				return do_linear_fault(mm, vma, address, pte,

					pmd, flags, entry);



			return do_anonymous_page(mm, vma, address, pte, pmd,

					flags);

		}

		if (pte_file(entry))

			return do_nonlinear_fault(mm, vma, address,