Skip to content

Commit 3049def

Browse files
peaktocreekakpm00
authored andcommitted
mseal sysmap: enable x86-64
Provide support for CONFIG_MSEAL_SYSTEM_MAPPINGS on x86-64, covering the vdso, vvar, vvar_vclock. Production release testing passes on Android and Chrome OS. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Jeff Xu <[email protected]> Reviewed-by: Lorenzo Stoakes <[email protected]> Reviewed-by: Liam R. Howlett <[email protected]> Reviewed-by: Kees Cook <[email protected]> Cc: Adhemerval Zanella <[email protected]> Cc: Alexander Mikhalitsyn <[email protected]> Cc: Alexey Dobriyan <[email protected]> Cc: Andrei Vagin <[email protected]> Cc: Anna-Maria Behnsen <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Benjamin Berg <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Dave Hansen <[email protected]> Cc: David Rientjes <[email protected]> Cc: David S. Miller <[email protected]> Cc: Elliot Hughes <[email protected]> Cc: Florian Faineli <[email protected]> Cc: Greg Ungerer <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Helge Deller <[email protected]> Cc: Hyeonggon Yoo <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jann Horn <[email protected]> Cc: Jason A. Donenfeld <[email protected]> Cc: Johannes Berg <[email protected]> Cc: Jorge Lucangeli Obes <[email protected]> Cc: Linus Waleij <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Matthew Wilcow (Oracle) <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Miguel Ojeda <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Pedro Falcato <[email protected]> Cc: Peter Xu <[email protected]> Cc: Randy Dunlap <[email protected]> Cc: Stephen Röttger <[email protected]> Cc: Thomas Weißschuh <[email protected]> Cc: Vlastimil Babka <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 1d6fad7 commit 3049def

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

arch/x86/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ config X86_64
2727
# Options that are inherently 64-bit kernel only:
2828
select ARCH_HAS_GIGANTIC_PAGE
2929
select ARCH_HAS_PTDUMP
30+
select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS
3031
select ARCH_SUPPORTS_INT128 if CC_HAS_INT128
3132
select ARCH_SUPPORTS_PER_VMA_LOCK
3233
select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE

arch/x86/entry/vdso/vma.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
162162
text_start,
163163
image->size,
164164
VM_READ|VM_EXEC|
165-
VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
165+
VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
166+
VM_SEALED_SYSMAP,
166167
&vdso_mapping);
167168

168169
if (IS_ERR(vma)) {
@@ -181,7 +182,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
181182
VDSO_VCLOCK_PAGES_START(addr),
182183
VDSO_NR_VCLOCK_PAGES * PAGE_SIZE,
183184
VM_READ|VM_MAYREAD|VM_IO|VM_DONTDUMP|
184-
VM_PFNMAP,
185+
VM_PFNMAP|VM_SEALED_SYSMAP,
185186
&vvar_vclock_mapping);
186187

187188
if (IS_ERR(vma)) {

0 commit comments

Comments
 (0)