Merge tag 'execve-v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull execve updates from Kees Cook: - elf: Define and use note name macros (Akihiko Odaki) - elf: add remaining SHF_ flag macros (Timur Tabi) - binfmt: Remove loader from linux_binprm struct (Yonatan Goldschmidt) - binfmt_elf_fdpic: fix variable set but not used warning (sunliming) * tag 'execve-v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: binfmt_elf_fdpic: fix variable set but not used warning elf: add remaining SHF_ flag macros binfmt: Remove loader from linux_binprm struct crash: Remove KEXEC_CORE_NOTE_NAME s390/crash: Use note name macros crash: Use note name macros powerpc/crash: Use note name macros binfmt_elf: Use note name macros elf: Define note name macros
This commit is contained in:
Linus Torvalds
@@ -291,8 +291,18 @@ typedef struct elf64_phdr {
|
||||
#define SHF_WRITE 0x1
|
||||
#define SHF_ALLOC 0x2
|
||||
#define SHF_EXECINSTR 0x4
|
||||
#define SHF_MERGE 0x10
|
||||
#define SHF_STRINGS 0x20
|
||||
#define SHF_INFO_LINK 0x40
|
||||
#define SHF_LINK_ORDER 0x80
|
||||
#define SHF_OS_NONCONFORMING 0x100
|
||||
#define SHF_GROUP 0x200
|
||||
#define SHF_TLS 0x400
|
||||
#define SHF_RELA_LIVEPATCH 0x00100000
|
||||
#define SHF_RO_AFTER_INIT 0x00200000
|
||||
#define SHF_ORDERED 0x04000000
|
||||
#define SHF_EXCLUDE 0x08000000
|
||||
#define SHF_MASKOS 0x0ff00000
|
||||
#define SHF_MASKPROC 0xf0000000
|
||||
|
||||
/* special section indexes */
|
||||
@@ -368,101 +378,180 @@ typedef struct elf64_shdr {
|
||||
#define ELF_OSABI ELFOSABI_NONE
|
||||
#endif
|
||||
|
||||
/* Note definitions: NN_ defines names. NT_ defines types. */
|
||||
|
||||
#define NN_GNU_PROPERTY_TYPE_0 "GNU"
|
||||
#define NT_GNU_PROPERTY_TYPE_0 5
|
||||
|
||||
/*
|
||||
* Notes used in ET_CORE. Architectures export some of the arch register sets
|
||||
* using the corresponding note types via the PTRACE_GETREGSET and
|
||||
* PTRACE_SETREGSET requests.
|
||||
* The note name for these types is "LINUX", except NT_PRFPREG that is named
|
||||
* "CORE".
|
||||
*/
|
||||
#define NN_PRSTATUS "CORE"
|
||||
#define NT_PRSTATUS 1
|
||||
#define NN_PRFPREG "CORE"
|
||||
#define NT_PRFPREG 2
|
||||
#define NN_PRPSINFO "CORE"
|
||||
#define NT_PRPSINFO 3
|
||||
#define NN_TASKSTRUCT "CORE"
|
||||
#define NT_TASKSTRUCT 4
|
||||
#define NN_AUXV "CORE"
|
||||
#define NT_AUXV 6
|
||||
/*
|
||||
* Note to userspace developers: size of NT_SIGINFO note may increase
|
||||
* in the future to accomodate more fields, don't assume it is fixed!
|
||||
*/
|
||||
#define NN_SIGINFO "CORE"
|
||||
#define NT_SIGINFO 0x53494749
|
||||
#define NN_FILE "CORE"
|
||||
#define NT_FILE 0x46494c45
|
||||
#define NN_PRXFPREG "LINUX"
|
||||
#define NT_PRXFPREG 0x46e62b7f /* copied from gdb5.1/include/elf/common.h */
|
||||
#define NN_PPC_VMX "LINUX"
|
||||
#define NT_PPC_VMX 0x100 /* PowerPC Altivec/VMX registers */
|
||||
#define NN_PPC_SPE "LINUX"
|
||||
#define NT_PPC_SPE 0x101 /* PowerPC SPE/EVR registers */
|
||||
#define NN_PPC_VSX "LINUX"
|
||||
#define NT_PPC_VSX 0x102 /* PowerPC VSX registers */
|
||||
#define NN_PPC_TAR "LINUX"
|
||||
#define NT_PPC_TAR 0x103 /* Target Address Register */
|
||||
#define NN_PPC_PPR "LINUX"
|
||||
#define NT_PPC_PPR 0x104 /* Program Priority Register */
|
||||
#define NN_PPC_DSCR "LINUX"
|
||||
#define NT_PPC_DSCR 0x105 /* Data Stream Control Register */
|
||||
#define NN_PPC_EBB "LINUX"
|
||||
#define NT_PPC_EBB 0x106 /* Event Based Branch Registers */
|
||||
#define NN_PPC_PMU "LINUX"
|
||||
#define NT_PPC_PMU 0x107 /* Performance Monitor Registers */
|
||||
#define NN_PPC_TM_CGPR "LINUX"
|
||||
#define NT_PPC_TM_CGPR 0x108 /* TM checkpointed GPR Registers */
|
||||
#define NN_PPC_TM_CFPR "LINUX"
|
||||
#define NT_PPC_TM_CFPR 0x109 /* TM checkpointed FPR Registers */
|
||||
#define NN_PPC_TM_CVMX "LINUX"
|
||||
#define NT_PPC_TM_CVMX 0x10a /* TM checkpointed VMX Registers */
|
||||
#define NN_PPC_TM_CVSX "LINUX"
|
||||
#define NT_PPC_TM_CVSX 0x10b /* TM checkpointed VSX Registers */
|
||||
#define NN_PPC_TM_SPR "LINUX"
|
||||
#define NT_PPC_TM_SPR 0x10c /* TM Special Purpose Registers */
|
||||
#define NN_PPC_TM_CTAR "LINUX"
|
||||
#define NT_PPC_TM_CTAR 0x10d /* TM checkpointed Target Address Register */
|
||||
#define NN_PPC_TM_CPPR "LINUX"
|
||||
#define NT_PPC_TM_CPPR 0x10e /* TM checkpointed Program Priority Register */
|
||||
#define NN_PPC_TM_CDSCR "LINUX"
|
||||
#define NT_PPC_TM_CDSCR 0x10f /* TM checkpointed Data Stream Control Register */
|
||||
#define NN_PPC_PKEY "LINUX"
|
||||
#define NT_PPC_PKEY 0x110 /* Memory Protection Keys registers */
|
||||
#define NN_PPC_DEXCR "LINUX"
|
||||
#define NT_PPC_DEXCR 0x111 /* PowerPC DEXCR registers */
|
||||
#define NN_PPC_HASHKEYR "LINUX"
|
||||
#define NT_PPC_HASHKEYR 0x112 /* PowerPC HASHKEYR register */
|
||||
#define NN_386_TLS "LINUX"
|
||||
#define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */
|
||||
#define NN_386_IOPERM "LINUX"
|
||||
#define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */
|
||||
#define NN_X86_XSTATE "LINUX"
|
||||
#define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */
|
||||
/* Old binutils treats 0x203 as a CET state */
|
||||
#define NN_X86_SHSTK "LINUX"
|
||||
#define NT_X86_SHSTK 0x204 /* x86 SHSTK state */
|
||||
#define NN_X86_XSAVE_LAYOUT "LINUX"
|
||||
#define NT_X86_XSAVE_LAYOUT 0x205 /* XSAVE layout description */
|
||||
#define NN_S390_HIGH_GPRS "LINUX"
|
||||
#define NT_S390_HIGH_GPRS 0x300 /* s390 upper register halves */
|
||||
#define NN_S390_TIMER "LINUX"
|
||||
#define NT_S390_TIMER 0x301 /* s390 timer register */
|
||||
#define NN_S390_TODCMP "LINUX"
|
||||
#define NT_S390_TODCMP 0x302 /* s390 TOD clock comparator register */
|
||||
#define NN_S390_TODPREG "LINUX"
|
||||
#define NT_S390_TODPREG 0x303 /* s390 TOD programmable register */
|
||||
#define NN_S390_CTRS "LINUX"
|
||||
#define NT_S390_CTRS 0x304 /* s390 control registers */
|
||||
#define NN_S390_PREFIX "LINUX"
|
||||
#define NT_S390_PREFIX 0x305 /* s390 prefix register */
|
||||
#define NN_S390_LAST_BREAK "LINUX"
|
||||
#define NT_S390_LAST_BREAK 0x306 /* s390 breaking event address */
|
||||
#define NN_S390_SYSTEM_CALL "LINUX"
|
||||
#define NT_S390_SYSTEM_CALL 0x307 /* s390 system call restart data */
|
||||
#define NN_S390_TDB "LINUX"
|
||||
#define NT_S390_TDB 0x308 /* s390 transaction diagnostic block */
|
||||
#define NN_S390_VXRS_LOW "LINUX"
|
||||
#define NT_S390_VXRS_LOW 0x309 /* s390 vector registers 0-15 upper half */
|
||||
#define NN_S390_VXRS_HIGH "LINUX"
|
||||
#define NT_S390_VXRS_HIGH 0x30a /* s390 vector registers 16-31 */
|
||||
#define NN_S390_GS_CB "LINUX"
|
||||
#define NT_S390_GS_CB 0x30b /* s390 guarded storage registers */
|
||||
#define NN_S390_GS_BC "LINUX"
|
||||
#define NT_S390_GS_BC 0x30c /* s390 guarded storage broadcast control block */
|
||||
#define NN_S390_RI_CB "LINUX"
|
||||
#define NT_S390_RI_CB 0x30d /* s390 runtime instrumentation */
|
||||
#define NN_S390_PV_CPU_DATA "LINUX"
|
||||
#define NT_S390_PV_CPU_DATA 0x30e /* s390 protvirt cpu dump data */
|
||||
#define NN_ARM_VFP "LINUX"
|
||||
#define NT_ARM_VFP 0x400 /* ARM VFP/NEON registers */
|
||||
#define NN_ARM_TLS "LINUX"
|
||||
#define NT_ARM_TLS 0x401 /* ARM TLS register */
|
||||
#define NN_ARM_HW_BREAK "LINUX"
|
||||
#define NT_ARM_HW_BREAK 0x402 /* ARM hardware breakpoint registers */
|
||||
#define NN_ARM_HW_WATCH "LINUX"
|
||||
#define NT_ARM_HW_WATCH 0x403 /* ARM hardware watchpoint registers */
|
||||
#define NN_ARM_SYSTEM_CALL "LINUX"
|
||||
#define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */
|
||||
#define NN_ARM_SVE "LINUX"
|
||||
#define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension registers */
|
||||
#define NN_ARM_PAC_MASK "LINUX"
|
||||
#define NT_ARM_PAC_MASK 0x406 /* ARM pointer authentication code masks */
|
||||
#define NN_ARM_PACA_KEYS "LINUX"
|
||||
#define NT_ARM_PACA_KEYS 0x407 /* ARM pointer authentication address keys */
|
||||
#define NN_ARM_PACG_KEYS "LINUX"
|
||||
#define NT_ARM_PACG_KEYS 0x408 /* ARM pointer authentication generic key */
|
||||
#define NN_ARM_TAGGED_ADDR_CTRL "LINUX"
|
||||
#define NT_ARM_TAGGED_ADDR_CTRL 0x409 /* arm64 tagged address control (prctl()) */
|
||||
#define NN_ARM_PAC_ENABLED_KEYS "LINUX"
|
||||
#define NT_ARM_PAC_ENABLED_KEYS 0x40a /* arm64 ptr auth enabled keys (prctl()) */
|
||||
#define NN_ARM_SSVE "LINUX"
|
||||
#define NT_ARM_SSVE 0x40b /* ARM Streaming SVE registers */
|
||||
#define NN_ARM_ZA "LINUX"
|
||||
#define NT_ARM_ZA 0x40c /* ARM SME ZA registers */
|
||||
#define NN_ARM_ZT "LINUX"
|
||||
#define NT_ARM_ZT 0x40d /* ARM SME ZT registers */
|
||||
#define NN_ARM_FPMR "LINUX"
|
||||
#define NT_ARM_FPMR 0x40e /* ARM floating point mode register */
|
||||
#define NN_ARM_POE "LINUX"
|
||||
#define NT_ARM_POE 0x40f /* ARM POE registers */
|
||||
#define NN_ARM_GCS "LINUX"
|
||||
#define NT_ARM_GCS 0x410 /* ARM GCS state */
|
||||
#define NN_ARC_V2 "LINUX"
|
||||
#define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */
|
||||
#define NN_VMCOREDD "LINUX"
|
||||
#define NT_VMCOREDD 0x700 /* Vmcore Device Dump Note */
|
||||
#define NN_MIPS_DSP "LINUX"
|
||||
#define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers */
|
||||
#define NN_MIPS_FP_MODE "LINUX"
|
||||
#define NT_MIPS_FP_MODE 0x801 /* MIPS floating-point mode */
|
||||
#define NN_MIPS_MSA "LINUX"
|
||||
#define NT_MIPS_MSA 0x802 /* MIPS SIMD registers */
|
||||
#define NN_RISCV_CSR "LINUX"
|
||||
#define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */
|
||||
#define NN_RISCV_VECTOR "LINUX"
|
||||
#define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */
|
||||
#define NN_RISCV_TAGGED_ADDR_CTRL "LINUX"
|
||||
#define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */
|
||||
#define NN_LOONGARCH_CPUCFG "LINUX"
|
||||
#define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */
|
||||
#define NN_LOONGARCH_CSR "LINUX"
|
||||
#define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */
|
||||
#define NN_LOONGARCH_LSX "LINUX"
|
||||
#define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */
|
||||
#define NN_LOONGARCH_LASX "LINUX"
|
||||
#define NT_LOONGARCH_LASX 0xa03 /* LoongArch Loongson Advanced SIMD Extension registers */
|
||||
#define NN_LOONGARCH_LBT "LINUX"
|
||||
#define NT_LOONGARCH_LBT 0xa04 /* LoongArch Loongson Binary Translation registers */
|
||||
#define NN_LOONGARCH_HW_BREAK "LINUX"
|
||||
#define NT_LOONGARCH_HW_BREAK 0xa05 /* LoongArch hardware breakpoint registers */
|
||||
#define NN_LOONGARCH_HW_WATCH "LINUX"
|
||||
#define NT_LOONGARCH_HW_WATCH 0xa06 /* LoongArch hardware watchpoint registers */
|
||||
|
||||
/* Note types with note name "GNU" */
|
||||
#define NT_GNU_PROPERTY_TYPE_0 5
|
||||
|
||||
/* Note header in a PT_NOTE section */
|
||||
typedef struct elf32_note {
|
||||
Elf32_Word n_namesz; /* Name size */
|
||||
|
||||
Reference in New Issue
Block a user