diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 5b5fb23d34e..21654822f9c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -436,14 +436,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) main_argc = argc; main_argv = argv; -#ifdef HARDENEDBSD - /* Load PaX flags */ - if (aux_info[AT_PAXFLAGS] != NULL) { - pax_flags = aux_info[AT_PAXFLAGS]->a_un.a_val; - aux_info[AT_PAXFLAGS]->a_un.a_val = 0; - } -#endif - trust = !issetugid(); md_abi_variant_hook(aux_info); diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h index e99f1cdd14d..5ecc4260ddf 100644 --- a/sys/arm/include/elf.h +++ b/sys/arm/include/elf.h @@ -89,9 +89,8 @@ __ElfType(Auxinfo); #define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */ #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ -#define AT_PAXFLAGS 27 /* PaX / HardenedBSD flags */ -#define AT_COUNT 28 /* Count of defined aux entry types. */ +#define AT_COUNT 27 /* Count of defined aux entry types. */ #define R_ARM_COUNT 33 /* Count of defined relocation types. */ diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h index cb52ab0d61d..04487c43abf 100644 --- a/sys/arm64/include/elf.h +++ b/sys/arm64/include/elf.h @@ -96,9 +96,8 @@ __ElfType(Auxinfo); #define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */ #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ -#define AT_PAXFLAGS 27 /* PaX / HardenedBSD flags */ -#define AT_COUNT 28 /* Count of defined aux entry types. */ +#define AT_COUNT 27 /* Count of defined aux entry types. */ /* Define "machine" characteristics */ #if __ELF_WORD_SIZE == 64 diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 673dbbfa9a4..b83cdd1560c 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1277,7 +1277,6 @@ __elfN(freebsd_fixup)(register_t **stack_base, struct image_params *imgp) AUXARGS_ENTRY(pos, AT_FLAGS, args->flags); AUXARGS_ENTRY(pos, AT_ENTRY, args->entry); AUXARGS_ENTRY(pos, AT_BASE, args->base); - AUXARGS_ENTRY(pos, AT_PAXFLAGS, args->pax_flags); AUXARGS_ENTRY(pos, AT_EHDRFLAGS, args->hdr_eflags); if (imgp->execpathp != 0) AUXARGS_ENTRY(pos, AT_EXECPATH, imgp->execpathp); diff --git a/sys/mips/include/elf.h b/sys/mips/include/elf.h index 0f56572cdcf..c971f5b2175 100644 --- a/sys/mips/include/elf.h +++ b/sys/mips/include/elf.h @@ -149,9 +149,8 @@ __ElfType(Auxinfo); #define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */ #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ -#define AT_PAXFLAGS 27 /* PaX / HardenedBSD flags */ -#define AT_COUNT 28 /* Count of defined aux entry types. */ +#define AT_COUNT 27 /* Count of defined aux entry types. */ #define ET_DYN_LOAD_ADDR 0x0120000 diff --git a/sys/powerpc/include/elf.h b/sys/powerpc/include/elf.h index b5e150a2be8..6a763ad2fcf 100644 --- a/sys/powerpc/include/elf.h +++ b/sys/powerpc/include/elf.h @@ -116,9 +116,8 @@ __ElfType(Auxinfo); #define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */ #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ -#define AT_PAXFLAGS 27 /* PaX / HardenedBSD flags */ -#define AT_COUNT 28 /* Count of defined aux entry types. */ +#define AT_COUNT 27 /* Count of defined aux entry types. */ /* * Relocation types. diff --git a/sys/riscv/include/elf.h b/sys/riscv/include/elf.h index a75b2682357..214b9fa70b7 100644 --- a/sys/riscv/include/elf.h +++ b/sys/riscv/include/elf.h @@ -93,9 +93,8 @@ __ElfType(Auxinfo); #define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */ #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ -#define AT_PAXFLAGS 27 /* HardenedBSD PaX flags */ -#define AT_COUNT 28 /* Count of defined aux entry types. */ +#define AT_COUNT 27 /* Count of defined aux entry types. */ /* Define "machine" characteristics */ #define ELF_TARG_CLASS ELFCLASS64 diff --git a/sys/sparc64/include/elf.h b/sys/sparc64/include/elf.h index 875fe470e11..4abc57ecfc8 100644 --- a/sys/sparc64/include/elf.h +++ b/sys/sparc64/include/elf.h @@ -97,9 +97,8 @@ __ElfType(Auxinfo); #define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */ #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ -#define AT_PAXFLAGS 27 /* PaX / HardenedBSD flags */ -#define AT_COUNT 28 /* Count of defined aux entry types. */ +#define AT_COUNT 27 /* Count of defined aux entry types. */ /* Define "machine" characteristics */ #if __ELF_WORD_SIZE == 32 diff --git a/sys/x86/include/elf.h b/sys/x86/include/elf.h index 0fe13a5d885..4501d88bab6 100644 --- a/sys/x86/include/elf.h +++ b/sys/x86/include/elf.h @@ -105,9 +105,8 @@ __ElfType(Auxinfo); #define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */ #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ -#define AT_PAXFLAGS 27 /* PaX / HardenedBSD flags */ -#define AT_COUNT 28 /* Count of defined aux entry types. */ +#define AT_COUNT 27 /* Count of defined aux entry types. */ /* * Relocation types. @@ -194,9 +193,8 @@ __ElfType(Auxinfo); #define AT_EHDRFLAGS 24 /* e_flags field from elf hdr */ #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ -#define AT_PAXFLAGS 27 /* PaX / HardenedBSD flags */ -#define AT_COUNT 28 /* Count of defined aux entry types. */ +#define AT_COUNT 27 /* Count of defined aux entry types. */ /* * Relocation types.