Skip to content

Commit

Permalink
mm/core: Do not enforce PKEY permissions on remote mm access
Browse files Browse the repository at this point in the history
We try to enforce protection keys in software the same way that we
do in hardware.  (See long example below).

But, we only want to do this when accessing our *own* process's
memory.  If GDB set PKRU[6].AD=1 (disable access to PKEY 6), then
tried to PTRACE_POKE a target process which just happened to have
some mprotect_pkey(pkey=6) memory, we do *not* want to deny the
debugger access to that memory.  PKRU is fundamentally a
thread-local structure and we do not want to enforce it on access
to _another_ thread's data.

This gets especially tricky when we have workqueues or other
delayed-work mechanisms that might run in a random process's context.
We can check that we only enforce pkeys when operating on our *own* mm,
but delayed work gets performed when a random user context is active.
We might end up with a situation where a delayed-work gup fails when
running randomly under its "own" task but succeeds when running under
another process.  We want to avoid that.

To avoid that, we use the new GUP flag: FOLL_REMOTE and add a
fault flag: FAULT_FLAG_REMOTE.  They indicate that we are
walking an mm which is not guranteed to be the same as
current->mm and should not be subject to protection key
enforcement.

Thanks to Jerome Glisse for pointing out this scenario.

Signed-off-by: Dave Hansen <[email protected]>
Reviewed-by: Thomas Gleixner <[email protected]>
Cc: Alexey Kardashevskiy <[email protected]>
Cc: Andrea Arcangeli <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Boaz Harrosh <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Dave Chinner <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: David Gibson <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: Dominik Dingel <[email protected]>
Cc: Dominik Vogt <[email protected]>
Cc: Eric B Munson <[email protected]>
Cc: Geliang Tang <[email protected]>
Cc: Guan Xuetao <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Jason Low <[email protected]>
Cc: Jerome Marchand <[email protected]>
Cc: Joerg Roedel <[email protected]>
Cc: Kirill A. Shutemov <[email protected]>
Cc: Konstantin Khlebnikov <[email protected]>
Cc: Laurent Dufour <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Mikulas Patocka <[email protected]>
Cc: Minchan Kim <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Rik van Riel <[email protected]>
Cc: Sasha Levin <[email protected]>
Cc: Shachar Raindel <[email protected]>
Cc: Vlastimil Babka <[email protected]>
Cc: Xie XiuQi <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
hansendc authored and Ingo Molnar committed Feb 18, 2016
1 parent 9d95b17 commit 1b2ee12
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 14 deletions.
3 changes: 2 additions & 1 deletion arch/powerpc/include/asm/mmu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
{
}

static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write)
static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
bool write, bool foreign)
{
/* by default, allow everything */
return true;
Expand Down
3 changes: 2 additions & 1 deletion arch/s390/include/asm/mmu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
{
}

static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write)
static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
bool write, bool foreign)
{
/* by default, allow everything */
return true;
Expand Down
3 changes: 2 additions & 1 deletion arch/unicore32/include/asm/mmu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
{
}

static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write)
static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
bool write, bool foreign)
{
/* by default, allow everything */
return true;
Expand Down
5 changes: 3 additions & 2 deletions arch/x86/include/asm/mmu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,11 @@ static inline bool vma_is_foreign(struct vm_area_struct *vma)
return false;
}

static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write)
static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
bool write, bool foreign)
{
/* allow access if the VMA is not one from this process */
if (vma_is_foreign(vma))
if (foreign || vma_is_foreign(vma))
return true;
return __pkru_allows_pkey(vma_pkey(vma), write);
}
Expand Down
1 change: 1 addition & 0 deletions drivers/iommu/amd_iommu_v2.c
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ static void do_fault(struct work_struct *work)
flags |= FAULT_FLAG_USER;
if (fault->flags & PPR_FAULT_WRITE)
flags |= FAULT_FLAG_WRITE;
flags |= FAULT_FLAG_REMOTE;

down_read(&mm->mmap_sem);
vma = find_extend_vma(mm, address);
Expand Down
3 changes: 2 additions & 1 deletion include/asm-generic/mm_hooks.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
{
}

static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write)
static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
bool write, bool foreign)
{
/* by default, allow everything */
return true;
Expand Down
1 change: 1 addition & 0 deletions include/linux/mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ extern pgprot_t protection_map[16];
#define FAULT_FLAG_KILLABLE 0x10 /* The fault task is in SIGKILL killable region */
#define FAULT_FLAG_TRIED 0x20 /* Second try */
#define FAULT_FLAG_USER 0x40 /* The fault originated in userspace */
#define FAULT_FLAG_REMOTE 0x80 /* faulting for non current tsk/mm */

/*
* vm_fault is filled by the the pagefault handler and passed to the vma's
Expand Down
15 changes: 10 additions & 5 deletions mm/gup.c
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
return -ENOENT;
if (*flags & FOLL_WRITE)
fault_flags |= FAULT_FLAG_WRITE;
if (*flags & FOLL_REMOTE)
fault_flags |= FAULT_FLAG_REMOTE;
if (nonblocking)
fault_flags |= FAULT_FLAG_ALLOW_RETRY;
if (*flags & FOLL_NOWAIT)
Expand Down Expand Up @@ -415,11 +417,13 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags)
{
vm_flags_t vm_flags = vma->vm_flags;
int write = (gup_flags & FOLL_WRITE);
int foreign = (gup_flags & FOLL_REMOTE);

if (vm_flags & (VM_IO | VM_PFNMAP))
return -EFAULT;

if (gup_flags & FOLL_WRITE) {
if (write) {
if (!(vm_flags & VM_WRITE)) {
if (!(gup_flags & FOLL_FORCE))
return -EFAULT;
Expand All @@ -445,7 +449,7 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags)
if (!(vm_flags & VM_MAYREAD))
return -EFAULT;
}
if (!arch_vma_access_permitted(vma, (gup_flags & FOLL_WRITE)))
if (!arch_vma_access_permitted(vma, write, foreign))
return -EFAULT;
return 0;
}
Expand Down Expand Up @@ -615,17 +619,18 @@ EXPORT_SYMBOL(__get_user_pages);

bool vma_permits_fault(struct vm_area_struct *vma, unsigned int fault_flags)
{
bool write = !!(fault_flags & FAULT_FLAG_WRITE);
bool write = !!(fault_flags & FAULT_FLAG_WRITE);
bool foreign = !!(fault_flags & FAULT_FLAG_REMOTE);
vm_flags_t vm_flags = write ? VM_WRITE : VM_READ;

if (!(vm_flags & vma->vm_flags))
return false;

/*
* The architecture might have a hardware protection
* mechanism other than read/write that can deny access
* mechanism other than read/write that can deny access.
*/
if (!arch_vma_access_permitted(vma, write))
if (!arch_vma_access_permitted(vma, write, foreign))
return false;

return true;
Expand Down
10 changes: 8 additions & 2 deletions mm/ksm.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,10 @@ static inline bool ksm_test_exit(struct mm_struct *mm)
* in case the application has unmapped and remapped mm,addr meanwhile.
* Could a ksm page appear anywhere else? Actually yes, in a VM_PFNMAP
* mmap of /dev/mem or /dev/kmem, where we would not want to touch it.
*
* FAULT_FLAG/FOLL_REMOTE are because we do this outside the context
* of the process that owns 'vma'. We also do not want to enforce
* protection keys here anyway.
*/
static int break_ksm(struct vm_area_struct *vma, unsigned long addr)
{
Expand All @@ -367,12 +371,14 @@ static int break_ksm(struct vm_area_struct *vma, unsigned long addr)

do {
cond_resched();
page = follow_page(vma, addr, FOLL_GET | FOLL_MIGRATION);
page = follow_page(vma, addr,
FOLL_GET | FOLL_MIGRATION | FOLL_REMOTE);
if (IS_ERR_OR_NULL(page))
break;
if (PageKsm(page))
ret = handle_mm_fault(vma->vm_mm, vma, addr,
FAULT_FLAG_WRITE);
FAULT_FLAG_WRITE |
FAULT_FLAG_REMOTE);
else
ret = VM_FAULT_WRITE;
put_page(page);
Expand Down
3 changes: 2 additions & 1 deletion mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -3379,7 +3379,8 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
pmd_t *pmd;
pte_t *pte;

if (!arch_vma_access_permitted(vma, flags & FAULT_FLAG_WRITE))
if (!arch_vma_access_permitted(vma, flags & FAULT_FLAG_WRITE,
flags & FAULT_FLAG_REMOTE))
return VM_FAULT_SIGSEGV;

if (unlikely(is_vm_hugetlb_page(vma)))
Expand Down

0 comments on commit 1b2ee12

Please sign in to comment.