lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <167933036632.5837.13284433905417431566.tip-bot2@tip-bot2> Date: Mon, 20 Mar 2023 16:39:26 -0000 From: "tip-bot2 for Yu-cheng Yu" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: "Yu-cheng Yu" <yu-cheng.yu@...el.com>, Rick Edgecombe <rick.p.edgecombe@...el.com>, Dave Hansen <dave.hansen@...ux.intel.com>, "Borislav Petkov (AMD)" <bp@...en8.de>, Kees Cook <keescook@...omium.org>, "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>, "Mike Rapoport (IBM)" <rppt@...nel.org>, Pengfei Xu <pengfei.xu@...el.com>, John Allen <john.allen@....com>, x86@...nel.org, linux-kernel@...r.kernel.org Subject: [tip: x86/shstk] mm: Introduce VM_SHADOW_STACK for shadow stack memory The following commit has been merged into the x86/shstk branch of tip: Commit-ID: db31a5b7a897fd08fad6ebac9fb6516657b791a3 Gitweb: https://git.kernel.org/tip/db31a5b7a897fd08fad6ebac9fb6516657b791a3 Author: Yu-cheng Yu <yu-cheng.yu@...el.com> AuthorDate: Sat, 18 Mar 2023 17:15:13 -07:00 Committer: Dave Hansen <dave.hansen@...ux.intel.com> CommitterDate: Mon, 20 Mar 2023 09:01:10 -07:00 mm: Introduce VM_SHADOW_STACK for shadow stack memory New hardware extensions implement support for shadow stack memory, such as x86 Control-flow Enforcement Technology (CET). Add a new VM flag to identify these areas, for example, to be used to properly indicate shadow stack PTEs to the hardware. Shadow stack VMA creation will be tightly controlled and limited to anonymous memory to make the implementation simpler and since that is all that is required. The solution will rely on pte_mkwrite() to create the shadow stack PTEs, so it will not be required for vm_get_page_prot() to learn how to create shadow stack memory. For this reason document that VM_SHADOW_STACK should not be mixed with VM_SHARED. Co-developed-by: Rick Edgecombe <rick.p.edgecombe@...el.com> Signed-off-by: Yu-cheng Yu <yu-cheng.yu@...el.com> Signed-off-by: Rick Edgecombe <rick.p.edgecombe@...el.com> Signed-off-by: Dave Hansen <dave.hansen@...ux.intel.com> Reviewed-by: Borislav Petkov (AMD) <bp@...en8.de> Reviewed-by: Kees Cook <keescook@...omium.org> Reviewed-by: Kirill A. Shutemov <kirill.shutemov@...ux.intel.com> Acked-by: Mike Rapoport (IBM) <rppt@...nel.org> Tested-by: Pengfei Xu <pengfei.xu@...el.com> Tested-by: John Allen <john.allen@....com> Tested-by: Kees Cook <keescook@...omium.org> Link: https://lore.kernel.org/all/20230319001535.23210-19-rick.p.edgecombe%40intel.com --- Documentation/filesystems/proc.rst | 1 + fs/proc/task_mmu.c | 3 +++ include/linux/mm.h | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 9d5fd94..8b314df 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -564,6 +564,7 @@ encoded manner. The codes are the following: mt arm64 MTE allocation tags are enabled um userfaultfd missing tracking uw userfaultfd wr-protect tracking + ss shadow stack page == ======================================= Note that there is no guarantee that every flag and associated mnemonic will diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 6a96e17..324b092 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -711,6 +711,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR [ilog2(VM_UFFD_MINOR)] = "ui", #endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ +#ifdef CONFIG_X86_USER_SHADOW_STACK + [ilog2(VM_SHADOW_STACK)] = "ss", +#endif }; size_t i; diff --git a/include/linux/mm.h b/include/linux/mm.h index a1b31ca..097544a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -326,11 +326,13 @@ extern unsigned int kobjsize(const void *objp); #define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_4 36 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_5 37 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0) #define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1) #define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2) #define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3) #define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) +#define VM_HIGH_ARCH_5 BIT(VM_HIGH_ARCH_BIT_5) #endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ #ifdef CONFIG_ARCH_HAS_PKEYS @@ -346,6 +348,12 @@ extern unsigned int kobjsize(const void *objp); #endif #endif /* CONFIG_ARCH_HAS_PKEYS */ +#ifdef CONFIG_X86_USER_SHADOW_STACK +# define VM_SHADOW_STACK VM_HIGH_ARCH_5 /* Should not be set with VM_SHARED */ +#else +# define VM_SHADOW_STACK VM_NONE +#endif + #if defined(CONFIG_X86) # define VM_PAT VM_ARCH_1 /* PAT reserves whole VMA at once (x86) */ #elif defined(CONFIG_PPC)
Powered by blists - more mailing lists