diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2019-07-01 14:04:39 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-07-01 14:04:39 +1000 |
| commit | 8b8dc695143642c6a8bee2242f2f7af4232298ab (patch) | |
| tree | c36e89fcf8594e923f14016dc33f12736fd0f5af /arch/powerpc/mm/book3s64/pgtable.c | |
| parent | KVM: PPC: Book3S HV: Clear pending decrementer exceptions on nested guest entry (diff) | |
| parent | Merge tag 'powerpc-5.2-6' into fixes (diff) | |
| download | linux-dev-8b8dc695143642c6a8bee2242f2f7af4232298ab.tar.xz linux-dev-8b8dc695143642c6a8bee2242f2f7af4232298ab.zip | |
Merge branch 'fixes' into next
Merge our fixes branch into next, this brings in a number of commits
that fix bugs we don't want to hit in next, in particular the fix for
CVE-2019-12817.
Diffstat (limited to 'arch/powerpc/mm/book3s64/pgtable.c')
| -rw-r--r-- | arch/powerpc/mm/book3s64/pgtable.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c index ad3dd977c22d..953850a602f7 100644 --- a/arch/powerpc/mm/book3s64/pgtable.c +++ b/arch/powerpc/mm/book3s64/pgtable.c @@ -116,6 +116,9 @@ pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, /* * This ensures that generic code that rely on IRQ disabling * to prevent a parallel THP split work as expected. + * + * Marking the entry with _PAGE_INVALID && ~_PAGE_PRESENT requires + * a special case check in pmd_access_permitted. */ serialize_against_pte_lookup(vma->vm_mm); return __pmd(old_pmd); |