Commit 00a94817 authored Jun 19, 2015 by Will Deacon Committed by Mark Salyzyn Mar 30, 2017

UPSTREAM: arm64: vdso: work-around broken ELF toolchains in Makefile



(cherry pick from commit 6f1a6ae87c0c60d7c462ef8fd071f291aa7a9abb)

When building the kernel with a bare-metal (ELF) toolchain, the -shared
option may not be passed down to collect2, resulting in silent corruption
of the vDSO image (in particular, the DYNAMIC section is omitted).

The effect of this corruption is that the dynamic linker fails to find
the vDSO symbols and libc is instead used for the syscalls that we
intended to optimise (e.g. gettimeofday). Functionally, there is no
issue as the sigreturn trampoline is still intact and located by the
kernel.

This patch fixes the problem by explicitly passing -shared to the linker
when building the vDSO.

Cc: <stable@vger.kernel.org>
Reported-by: Szabolcs Nagy <Szabolcs.Nagy@arm.com>
Reported-by: James Greenlaigh <james.greenhalgh@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Bug: 20045882
Bug: 19198045
Change-Id: Ifa5152a7894978ea2fc3a4c2ed99ed07106e12f8

parent d39e2056

arch/arm64/kernel/vdso/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,10 @@ ccflags-y := -shared -fno-common -fno-builtin
		ccflags-y += -nostdlib -Wl,-soname=linux-vdso.so.1 \
		$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)

		# Workaround for bare-metal (ELF) toolchains that neglect to pass -shared
		# down to collect2, resulting in silent corruption of the vDSO image.
		ccflags-y += -Wl,-shared

		obj-y += vdso.o
		extra-y += vdso.lds vdso-offsets.h
		CPPFLAGS_vdso.lds += -P -C -U$(ARCH)