Commit db751e30 authored by Dave Martin's avatar Dave Martin Committed by Catalin Marinas
Browse files

ELF: UAPI and Kconfig additions for ELF program properties 



Pull the basic ELF definitions relating to the
NT_GNU_PROPERTY_TYPE_0 note from Yu-Cheng Yu's earlier x86 shstk
series.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
Signed-off-by: default avatarYu-cheng Yu <yu-cheng.yu@intel.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f8788d86

fs/Kconfig.binfmt

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ config COMPAT_BINFMT_ELF 
config ARCH_BINFMT_ELF_STATE

	bool



config ARCH_USE_GNU_PROPERTY

	bool



config BINFMT_ELF_FDPIC

	bool "Kernel support for FDPIC ELF binaries"

	default y if !BINFMT_ELF

include/linux/elf.h

+12 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef _LINUX_ELF_H

#define _LINUX_ELF_H



#include <linux/types.h>

#include <asm/elf.h>

#include <uapi/linux/elf.h>
@@ -56,4 +57,15 @@ static inline int elf_coredump_extra_notes_write(struct coredump_params *cprm) { 
extern int elf_coredump_extra_notes_size(void);

extern int elf_coredump_extra_notes_write(struct coredump_params *cprm);

#endif



/*

 * NT_GNU_PROPERTY_TYPE_0 header:

 * Keep this internal until/unless there is an agreed UAPI definition.

 * pr_type values (GNU_PROPERTY_*) are public and defined in the UAPI header.

 */

struct gnu_property {

	u32 pr_type;

	u32 pr_datasz;

};



#endif /* _LINUX_ELF_H */

include/uapi/linux/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ typedef __s64 Elf64_Sxword; 
#define PT_LOPROC  0x70000000

#define PT_HIPROC  0x7fffffff

#define PT_GNU_EH_FRAME		0x6474e550

#define PT_GNU_PROPERTY		0x6474e553



#define PT_GNU_STACK	(PT_LOOS + 0x474e551)