tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

bpf: Add dummy type reference to nf_conn___init to fix type deduplication

The bpf_ct_set_nat_info() kfunc is defined in the nf_nat.ko module, and
takes as a parameter the nf_conn___init struct, which is allocated through
the bpf_xdp_ct_alloc() helper defined in the nf_conntrack.ko module.
However, because kernel modules can't deduplicate BTF types between each
other, and the nf_conn___init struct is not referenced anywhere in vmlinux
BTF, this leads to two distinct BTF IDs for the same type (one in each
module). This confuses the verifier, as described here:

https://lore.kernel.org/all/87leoh372s.fsf@toke.dk/

As a workaround, add an explicit BTF_TYPE_EMIT for the type in
net/filter.c, so the type definition gets included in vmlinux BTF. This
way, both modules can refer to the same type ID (as they both build on top
of vmlinux BTF), and the verifier is no longer confused.

v2:

- Use BTF_TYPE_EMIT (which is a statement so it has to be inside a function
definition; use xdp_func_proto() for this, since this is mostly
xdp-related).

Fixes: 820dc0523e05 ("net: netfilter: move bpf_ct_set_nat_info kfunc in nf_nat_bpf.c")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20221201123939.696558-1-toke@redhat.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Toke Høiland-Jørgensen and committed by
Alexei Starovoitov 578ce69f 41d76c72

+14
+14
net/core/filter.c
··· 80 80 #include <net/tls.h> 81 81 #include <net/xdp.h> 82 82 #include <net/mptcp.h> 83 + #include <net/netfilter/nf_conntrack_bpf.h> 83 84 84 85 static const struct bpf_func_proto * 85 86 bpf_sk_base_func_proto(enum bpf_func_id func_id); ··· 7993 7992 default: 7994 7993 return bpf_sk_base_func_proto(func_id); 7995 7994 } 7995 + 7996 + #if IS_MODULE(CONFIG_NF_CONNTRACK) && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES) 7997 + /* The nf_conn___init type is used in the NF_CONNTRACK kfuncs. The 7998 + * kfuncs are defined in two different modules, and we want to be able 7999 + * to use them interchangably with the same BTF type ID. Because modules 8000 + * can't de-duplicate BTF IDs between each other, we need the type to be 8001 + * referenced in the vmlinux BTF or the verifier will get confused about 8002 + * the different types. So we add this dummy type reference which will 8003 + * be included in vmlinux BTF, allowing both modules to refer to the 8004 + * same type ID. 8005 + */ 8006 + BTF_TYPE_EMIT(struct nf_conn___init); 8007 + #endif 7996 8008 } 7997 8009 7998 8010 const struct bpf_func_proto bpf_sock_map_update_proto __weak;