mirror of
https://github.com/torvalds/linux
synced 2024-07-21 10:41:44 +00:00
9326e0f85b
Originally, bpfilter_umh was linked with -static only when CONFIG_BPFILTER_UMH=y. Commit8a2cc0505c("bpfilter: use 'userprogs' syntax to build bpfilter_umh") silently, accidentally dropped the CONFIG_BPFILTER_UMH=y test in the Makefile. Revive it in order to link it dynamically when CONFIG_BPFILTER_UMH=m. Since commitb1183b6dca("bpfilter: check if $(CC) can link static libc in Kconfig"), the compiler must be capable of static linking to enable CONFIG_BPFILTER_UMH, but it requires more than needed. To loosen the compiler requirement, I changed the dependency as follows: depends on CC_CAN_LINK depends on m || CC_CAN_LINK_STATIC If CONFIG_CC_CAN_LINK_STATIC in unset, CONFIG_BPFILTER_UMH is restricted to 'm' or 'n'. In theory, CONFIG_CC_CAN_LINK is not required for CONFIG_BPFILTER_UMH=y, but I did not come up with a good way to describe it. Fixes:8a2cc0505c("bpfilter: use 'userprogs' syntax to build bpfilter_umh") Reported-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Tested-by: Michal Kubecek <mkubecek@suse.cz> Link: https://lore.kernel.org/bpf/20200701092644.762234-1-masahiroy@kernel.org
21 lines
584 B
Makefile
21 lines
584 B
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Makefile for the Linux BPFILTER layer.
|
|
#
|
|
|
|
userprogs := bpfilter_umh
|
|
bpfilter_umh-objs := main.o
|
|
userccflags += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi
|
|
|
|
ifeq ($(CONFIG_BPFILTER_UMH), y)
|
|
# builtin bpfilter_umh should be linked with -static
|
|
# since rootfs isn't mounted at the time of __init
|
|
# function is called and do_execv won't find elf interpreter
|
|
userldflags += -static
|
|
endif
|
|
|
|
$(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh
|
|
|
|
obj-$(CONFIG_BPFILTER_UMH) += bpfilter.o
|
|
bpfilter-objs += bpfilter_kern.o bpfilter_umh_blob.o
|