Commit 4e6e8c2b authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas
Browse files

binfmt_elf: Wire up AT_HWCAP3 at AT_HWCAP4 



AT_HWCAP3 and AT_HWCAP4 were recently defined for use on PowerPC in commit
3281366a ("uapi/auxvec: Define AT_HWCAP3 and AT_HWCAP4 aux vector,
entries"). Since we want to start using AT_HWCAP3 on arm64 add support for
exposing both these new hwcaps via binfmt_elf.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarKees Cook <kees@kernel.org>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20241004-arm64-elf-hwcap3-v2-1-799d1daad8b0@kernel.org


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 9852d85e

fs/binfmt_elf.c

+6 −0
Original line number Diff line number Diff line
@@ -257,6 +257,12 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec, 
	NEW_AUX_ENT(AT_RANDOM, (elf_addr_t)(unsigned long)u_rand_bytes);

#ifdef ELF_HWCAP2

	NEW_AUX_ENT(AT_HWCAP2, ELF_HWCAP2);

#endif

#ifdef ELF_HWCAP3

	NEW_AUX_ENT(AT_HWCAP3, ELF_HWCAP3);

#endif

#ifdef ELF_HWCAP4

	NEW_AUX_ENT(AT_HWCAP4, ELF_HWCAP4);

#endif

	NEW_AUX_ENT(AT_EXECFN, bprm->exec);

	if (k_platform) {

fs/binfmt_elf_fdpic.c

+6 −0
Original line number Diff line number Diff line
@@ -623,6 +623,12 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, 
	NEW_AUX_ENT(AT_HWCAP,	ELF_HWCAP);

#ifdef ELF_HWCAP2

	NEW_AUX_ENT(AT_HWCAP2,	ELF_HWCAP2);

#endif

#ifdef ELF_HWCAP3

	NEW_AUX_ENT(AT_HWCAP3,	ELF_HWCAP3);

#endif

#ifdef ELF_HWCAP4

	NEW_AUX_ENT(AT_HWCAP4,	ELF_HWCAP4);

#endif

	NEW_AUX_ENT(AT_PAGESZ,	PAGE_SIZE);

	NEW_AUX_ENT(AT_CLKTCK,	CLOCKS_PER_SEC);

fs/compat_binfmt_elf.c

+10 −0
Original line number Diff line number Diff line
@@ -80,6 +80,16 @@ 
#define	ELF_HWCAP2		COMPAT_ELF_HWCAP2

#endif



#ifdef	COMPAT_ELF_HWCAP3

#undef	ELF_HWCAP3

#define	ELF_HWCAP3		COMPAT_ELF_HWCAP3

#endif



#ifdef	COMPAT_ELF_HWCAP4

#undef	ELF_HWCAP4

#define	ELF_HWCAP4		COMPAT_ELF_HWCAP4

#endif



#ifdef	COMPAT_ARCH_DLINFO

#undef	ARCH_DLINFO

#define	ARCH_DLINFO		COMPAT_ARCH_DLINFO