bpf, lsm: Make BPF_LSM depend on BPF_EVENTS
authorKP Singh <kpsingh@google.com>
Mon, 30 Mar 2020 20:40:59 +0000 (22:40 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 30 Mar 2020 20:57:23 +0000 (22:57 +0200)
LSM and tracing programs share their helpers with bpf_tracing_func_proto
which is only defined (in bpf_trace.c) when BPF_EVENTS is enabled.

Instead of adding __weak symbol, make BPF_LSM depend on BPF_EVENTS so
that both tracing and LSM programs can actually share helpers.

Fixes: fc611f47f218 ("bpf: Introduce BPF_PROG_TYPE_LSM")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: KP Singh <kpsingh@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200330204059.13024-1-kpsingh@chromium.org
init/Kconfig

index deae572..7b7ea70 100644 (file)
@@ -1619,6 +1619,7 @@ config KALLSYMS_BASE_RELATIVE
 
 config BPF_LSM
        bool "LSM Instrumentation with BPF"
+       depends on BPF_EVENTS
        depends on BPF_SYSCALL
        depends on SECURITY
        depends on BPF_JIT