summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorCong Wang <cong.wang@bytedance.com>2021-02-23 10:49:26 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-27 11:04:09 +0100
commit1b2347f3c5fe46d6f20f85ce8fcd92387f97a9f9 (patch)
tree202e0982f6eb7582e12a216865c4f5f0b8e1fe68 /init
parent6b9dee829ef98ef4908bf467e3e4d52bb9aa2659 (diff)
downloadlinux-1b2347f3c5fe46d6f20f85ce8fcd92387f97a9f9.tar.gz
linux-1b2347f3c5fe46d6f20f85ce8fcd92387f97a9f9.tar.bz2
linux-1b2347f3c5fe46d6f20f85ce8fcd92387f97a9f9.zip
bpf: Clean up sockmap related Kconfigs
[ Upstream commit 887596095ec2a9ea39ffcf98f27bf2e77c5eb512 ] As suggested by John, clean up sockmap related Kconfigs: Reduce the scope of CONFIG_BPF_STREAM_PARSER down to TCP stream parser, to reflect its name. Make the rest sockmap code simply depend on CONFIG_BPF_SYSCALL and CONFIG_INET, the latter is still needed at this point because of TCP/UDP proto update. And leave CONFIG_NET_SOCK_MSG untouched, as it is used by non-sockmap cases. Signed-off-by: Cong Wang <cong.wang@bytedance.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Reviewed-by: Lorenz Bauer <lmb@cloudflare.com> Acked-by: John Fastabend <john.fastabend@gmail.com> Acked-by: Jakub Sitnicki <jakub@cloudflare.com> Link: https://lore.kernel.org/bpf/20210223184934.6054-2-xiyou.wangcong@gmail.com Stable-dep-of: 2660a544fdc0 ("net: Fix TOCTOU issue in sk_is_readable()") Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 233166e54df3..a6a4eaec73c8 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1720,6 +1720,7 @@ config BPF_SYSCALL
select BPF
select IRQ_WORK
select TASKS_TRACE_RCU
+ select NET_SOCK_MSG if INET
default n
help
Enable the bpf() system call that allows to manipulate eBPF