Commit d2ed5cb8 authored Nov 02, 2008 by Russell King Committed by Russell King Nov 04, 2008

[ARM] fix VFP+softfloat binaries



2.6.28-rc tightened up the ELF architecture checks on ARM.  For
non-EABI it only allows VFP if the hardware supports it.  However,
the kernel fails to also inspect the soft-float flag, so it
incorrectly rejects binaries using soft-VFP.

The fix is simple: also check that EF_ARM_SOFT_FLOAT isn't set
before rejecting VFP binaries on non-VFP hardware.

Acked-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent a75952b7

arch/arm/kernel/elf.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -21,12 +21,16 @@ int elf_check_arch(const struct elf32_hdr *x)

		eflags = x->e_flags;
		if ((eflags & EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN) {
		unsigned int flt_fmt;

		/* APCS26 is only allowed if the CPU supports it */
		if ((eflags & EF_ARM_APCS_26) && !(elf_hwcap & HWCAP_26BIT))
		return 0;

		flt_fmt = eflags & (EF_ARM_VFP_FLOAT \| EF_ARM_SOFT_FLOAT);

		/* VFP requires the supporting code */
		if ((eflags & EF_ARM_VFP_FLOAT) && !(elf_hwcap & HWCAP_VFP))
		if (flt_fmt == EF_ARM_VFP_FLOAT && !(elf_hwcap & HWCAP_VFP))
		return 0;
		}
		return 1;

Admin message