Skip to content

Commit 3630e82

Browse files
brooniectmarinas
authored andcommitted
mman: Add map_shadow_stack() flags
In preparation for adding arm64 GCS support make the map_shadow_stack() SHADOW_STACK_SET_TOKEN flag generic and add _SET_MARKER. The existing flag indicates that a token usable for stack switch should be added to the top of the newly mapped GCS region while the new flag indicates that a top of stack marker suitable for use by unwinders should be added above that. For arm64 the top of stack marker is all bits 0. Reviewed-by: Thiago Jung Bauermann <[email protected]> Reviewed-by: Catalin Marinas <[email protected]> Acked-by: Yury Khrustalev <[email protected]> Signed-off-by: Mark Brown <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 91e102e commit 3630e82

File tree

2 files changed

+4
-3
lines changed
  • arch/x86/include/uapi/asm
  • include/uapi/asm-generic

2 files changed

+4
-3
lines changed

arch/x86/include/uapi/asm/mman.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
#define MAP_32BIT 0x40 /* only give out 32bit addresses */
66
#define MAP_ABOVE4G 0x80 /* only map above 4GB */
77

8-
/* Flags for map_shadow_stack(2) */
9-
#define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */
10-
118
#include <asm-generic/mman.h>
129

1310
#endif /* _ASM_X86_MMAN_H */

include/uapi/asm-generic/mman.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@
1919
#define MCL_FUTURE 2 /* lock all future mappings */
2020
#define MCL_ONFAULT 4 /* lock all pages that are faulted in */
2121

22+
#define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */
23+
#define SHADOW_STACK_SET_MARKER (1ULL << 1) /* Set up a top of stack marker in the shadow stack */
24+
25+
2226
#endif /* __ASM_GENERIC_MMAN_H */

0 commit comments

Comments
 (0)