018b0292c1
[ Upstream commit d7a49291d786b4400996afe3afcc3ef5eeb6f0ef ]
The "bti" selftests are built with -nostdlib, which apparently
automatically creates a statically linked binary, which is what we want
and need for BTI (to avoid interactions with the dynamic linker).
However this is not true when building a PIE binary, which some
toolchains (Ubuntu) configure as the default.
When compiling btitest with such a toolchain, it will create a
dynamically linked binary, which will probably fail some tests, as the
dynamic linker might not support BTI:
===================
TAP version 13
1..18
not ok 1 nohint_func/call_using_br_x0
not ok 2 nohint_func/call_using_br_x16
not ok 3 nohint_func/call_using_blr
....
===================
To make sure we create static binaries, add an explicit -static on the
linker command line. This forces static linking even if the toolchain
defaults to PIE builds, and fixes btitest runs on BTI enabled machines.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Fixes: 314bcbf09f ("kselftest: arm64: Add BTI tests")
Link: https://lore.kernel.org/r/20220511172129.2078337-1-andre.przywara@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
62 lines
1.8 KiB
Makefile
62 lines
1.8 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
TEST_GEN_PROGS := btitest nobtitest
|
|
|
|
PROGS := $(patsubst %,gen/%,$(TEST_GEN_PROGS))
|
|
|
|
# These tests are built as freestanding binaries since otherwise BTI
|
|
# support in ld.so is required which is not currently widespread; when
|
|
# it is available it will still be useful to test this separately as the
|
|
# cases for statically linked and dynamically lined binaries are
|
|
# slightly different.
|
|
|
|
CFLAGS_NOBTI = -DBTI=0
|
|
CFLAGS_BTI = -mbranch-protection=standard -DBTI=1
|
|
|
|
CFLAGS_COMMON = -ffreestanding -Wall -Wextra $(CFLAGS)
|
|
|
|
BTI_CC_COMMAND = $(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -c -o $@ $<
|
|
NOBTI_CC_COMMAND = $(CC) $(CFLAGS_NOBTI) $(CFLAGS_COMMON) -c -o $@ $<
|
|
|
|
%-bti.o: %.c
|
|
$(BTI_CC_COMMAND)
|
|
|
|
%-bti.o: %.S
|
|
$(BTI_CC_COMMAND)
|
|
|
|
%-nobti.o: %.c
|
|
$(NOBTI_CC_COMMAND)
|
|
|
|
%-nobti.o: %.S
|
|
$(NOBTI_CC_COMMAND)
|
|
|
|
BTI_OBJS = \
|
|
test-bti.o \
|
|
signal-bti.o \
|
|
start-bti.o \
|
|
syscall-bti.o \
|
|
system-bti.o \
|
|
teststubs-bti.o \
|
|
trampoline-bti.o
|
|
gen/btitest: $(BTI_OBJS)
|
|
$(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -nostdlib -static -o $@ $^
|
|
|
|
NOBTI_OBJS = \
|
|
test-nobti.o \
|
|
signal-nobti.o \
|
|
start-nobti.o \
|
|
syscall-nobti.o \
|
|
system-nobti.o \
|
|
teststubs-nobti.o \
|
|
trampoline-nobti.o
|
|
gen/nobtitest: $(NOBTI_OBJS)
|
|
$(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -nostdlib -static -o $@ $^
|
|
|
|
# Including KSFT lib.mk here will also mangle the TEST_GEN_PROGS list
|
|
# to account for any OUTPUT target-dirs optionally provided by
|
|
# the toplevel makefile
|
|
include ../../lib.mk
|
|
|
|
$(TEST_GEN_PROGS): $(PROGS)
|
|
cp $(PROGS) $(OUTPUT)/
|