Export the rseq feature size supported by the kernel as well as the required allocation alignment for the rseq per-thread area to user-space through ELF auxiliary vector entries. This is part of the extensible rseq ABI.
Unified · Split
| @@ -46,6 +46,7 @@ · 45 unmodified lines | ||
| 46 | 46 | #include <linux/cred.h> |
| 47 | 47 | #include <linux/dax.h> |
| 48 | 48 | #include <linux/uaccess.h> |
| 49 | +#include <linux/rseq.h> | |
| 49 | 50 | #include <asm/param.h> |
| 50 | 51 | #include <asm/page.h> |
| 51 | 52 | |
| @@ -288,6 +289,10 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec, · 236 unmodified lines | ||
| 288 | 289 | if (bprm->have_execfd) { |
| 289 | 290 | NEW_AUX_ENT(AT_EXECFD, bprm->execfd); |
| 290 | 291 | } |
| 292 | +#ifdef CONFIG_RSEQ | |
| 293 | + NEW_AUX_ENT(AT_RSEQ_FEATURE_SIZE, offsetof(struct rseq, end)); | |
| 294 | + NEW_AUX_ENT(AT_RSEQ_ALIGN, __alignof__(struct rseq)); | |
| 295 | +#endif | |
| 291 | 296 | #undef NEW_AUX_ENT |
| 292 | 297 | /* AT_NULL is zero; clear the rest too */ |
| 293 | 298 | memset(elf_info, 0, (char *)mm->saved_auxv + |
| @@ -30,6 +30,8 @@ · 29 unmodified lines | ||
| 30 | 30 | * differ from AT_PLATFORM. */ |
| 31 | 31 | #define AT_RANDOM 25 /* address of 16 random bytes */ |
| 32 | 32 | #define AT_HWCAP2 26 /* extension of AT_HWCAP */ |
| 33 | +#define AT_RSEQ_FEATURE_SIZE 27 /* rseq supported feature size */ | |
| 34 | +#define AT_RSEQ_ALIGN 28 /* rseq allocation alignment */ | |
| 33 | 35 | |
| 34 | 36 | #define AT_EXECFN 31 /* filename of program */ |
| 35 | 37 | |
| @@ -130,6 +130,11 @@ struct rseq { · 129 unmodified lines | ||
| 130 | 130 | * this thread. |
| 131 | 131 | */ |
| 132 | 132 | __u32 flags; |
| 133 | + | |
| 134 | + /* | |
| 135 | + * Flexible array member at end of structure, after last feature field. | |
| 136 | + */ | |
| 137 | + char end[]; | |
| 133 | 138 | } __attribute__((aligned(4 * sizeof(__u64)))); |
| 134 | 139 | |
| 135 | 140 | #endif /* _UAPI_LINUX_RSEQ_H */ |