diff mbox series

[bpf-next] bpf: lsm: Make BPF_LSM depend on BPF_EVENTS

Message ID 20200330204059.13024-1-kpsingh@chromium.org
State Accepted
Delegated to: BPF Maintainers
Headers show
Series [bpf-next] bpf: lsm: Make BPF_LSM depend on BPF_EVENTS | expand

Commit Message

KP Singh March 30, 2020, 8:40 p.m. UTC 
From: KP Singh <kpsingh@google.com>

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.

Signed-off-by: KP Singh <kpsingh@google.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Fixes: fc611f47f218 ("bpf: Introduce BPF_PROG_TYPE_LSM")
---
 init/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Daniel Borkmann March 30, 2020, 9 p.m. UTC | #1 
On 3/30/20 10:40 PM, KP Singh wrote:
> From: KP Singh <kpsingh@google.com>
> 
> 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.
> 
> Signed-off-by: KP Singh <kpsingh@google.com>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Fixes: fc611f47f218 ("bpf: Introduce BPF_PROG_TYPE_LSM")

Applied, thanks!
Randy Dunlap March 30, 2020, 9:01 p.m. UTC | #2 
On 3/30/20 2:00 PM, Daniel Borkmann wrote:
> On 3/30/20 10:40 PM, KP Singh wrote:
>> From: KP Singh <kpsingh@google.com>
>>
>> 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.
>>
>> Signed-off-by: KP Singh <kpsingh@google.com>
>> Reported-by: Randy Dunlap <rdunlap@infradead.org>
>> Fixes: fc611f47f218 ("bpf: Introduce BPF_PROG_TYPE_LSM")
> 
> Applied, thanks!

Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

thanks.
diff mbox series

Patch

diff --git a/init/Kconfig b/init/Kconfig
index deae572d1927..7b7ea70e64ac 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -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