iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/mm: Set fault flags earlier

Browse Source 
Move out the code that sets FAULT_FLAG_WRITE so the block that check
access permissions can be extracted. While at it also set
FAULT_FLAG_INSTRUCTION which will be used for protection keys.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Benjamin Herrenschmidt 2017-07-19 14:49:42 +10:00 committed by Michael Ellerman
parent b15021d994
commit d2e0d2c51a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/mm/fault.c
View File

@ -384,6 +384,10 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address,
if (is_user) if (is_user)
flags |= FAULT_FLAG_USER; flags |= FAULT_FLAG_USER;
if (is_write)
flags |= FAULT_FLAG_WRITE;
if (is_exec)
flags |= FAULT_FLAG_INSTRUCTION;
/* When running in the kernel we expect faults to occur only to /* When running in the kernel we expect faults to occur only to
* addresses in user space. All other faults represent errors in the * addresses in user space. All other faults represent errors in the
@ -476,7 +480,6 @@ good_area:
} else if (is_write) { } else if (is_write) {
if (unlikely(!(vma->vm_flags & VM_WRITE))) if (unlikely(!(vma->vm_flags & VM_WRITE)))
return bad_area(regs, address); return bad_area(regs, address);
flags |= FAULT_FLAG_WRITE;
/* a read */ /* a read */
} else { } else {
if (unlikely(!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))) if (unlikely(!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))))