Skip to content

Commit 6beb995

Browse files
rpedgecohansendc
authored andcommitted
mm: Don't allow write GUPs to shadow stack memory
The x86 Control-flow Enforcement Technology (CET) feature includes a new type of memory called shadow stack. This shadow stack memory has some unusual properties, which requires some core mm changes to function properly. In userspace, shadow stack memory is writable only in very specific, controlled ways. However, since userspace can, even in the limited ways, modify shadow stack contents, the kernel treats it as writable memory. As a result, without additional work there would remain many ways for userspace to trigger the kernel to write arbitrary data to shadow stacks via get_user_pages(, FOLL_WRITE) based operations. To help userspace protect their shadow stacks, make this a little less exposed by blocking writable get_user_pages() operations for shadow stack VMAs. Still allow FOLL_FORCE to write through shadow stack protections, as it does for read-only protections. This is required for debugging use cases. [ dhansen: fix rebase goof, readd writable_file_mapping_allowed() hunk ] Signed-off-by: Rick Edgecombe <[email protected]> Signed-off-by: Dave Hansen <[email protected]> Reviewed-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Kees Cook <[email protected]> Acked-by: Mike Rapoport (IBM) <[email protected]> Acked-by: David Hildenbrand <[email protected]> Tested-by: Pengfei Xu <[email protected]> Tested-by: John Allen <[email protected]> Tested-by: Kees Cook <[email protected]> Link: https://lore.kernel.org/all/20230613001108.3040476-23-rick.p.edgecombe%40intel.com
1 parent b497e52 commit 6beb995

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

arch/x86/include/asm/pgtable.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,6 +1631,11 @@ static inline bool __pte_access_permitted(unsigned long pteval, bool write)
16311631
{
16321632
unsigned long need_pte_bits = _PAGE_PRESENT|_PAGE_USER;
16331633

1634+
/*
1635+
* Write=0,Dirty=1 PTEs are shadow stack, which the kernel
1636+
* shouldn't generally allow access to, but since they
1637+
* are already Write=0, the below logic covers both cases.
1638+
*/
16341639
if (write)
16351640
need_pte_bits |= _PAGE_RW;
16361641

mm/gup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags)
10541054
!writable_file_mapping_allowed(vma, gup_flags))
10551055
return -EFAULT;
10561056

1057-
if (!(vm_flags & VM_WRITE)) {
1057+
if (!(vm_flags & VM_WRITE) || (vm_flags & VM_SHADOW_STACK)) {
10581058
if (!(gup_flags & FOLL_FORCE))
10591059
return -EFAULT;
10601060
/* hugetlb does not support FOLL_FORCE|FOLL_WRITE. */

0 commit comments

Comments
 (0)