Skip to contentSkip to conversation

bpf: minor clean-up to sleepable_lsm_hooks BTF set

PATCH Applied Matt Bobrowski 2 participants 2 messages Feb 1, 2024

Subsystems (3)
BPF Security (LSM) BPF LSM
lore
Share & tools
lore

Matt Bobrowski

author
#0 lore raw

PATCH 1/1 bpf: minor clean-up to sleepable_lsm_hooks BTF set

There's already one main CONFIG_SECURITY_NETWORK ifdef block within the sleepable_lsm_hooks BTF set. Consolidate this duplicated ifdef block as there's no need for it and all things guarded by it should remain in one place in this specific context.

Signed-off-by Matt Bobrowski <[email protected]>
---
 kernel/bpf/bpf_lsm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/bpf/bpf_lsm.c +2 -4
index 63b4dc495125..68240c3c6e7d 100644
@@ -282,10 +282,6 @@ BTF_ID(func, bpf_lsm_file_lock)
 BTF_ID(func, bpf_lsm_file_open)
 BTF_ID(func, bpf_lsm_file_receive)
 
-#ifdef CONFIG_SECURITY_NETWORK
-BTF_ID(func, bpf_lsm_inet_conn_established)
-#endif /* CONFIG_SECURITY_NETWORK */
-
 BTF_ID(func, bpf_lsm_inode_create)
 BTF_ID(func, bpf_lsm_inode_free_security)
 BTF_ID(func, bpf_lsm_inode_getattr)

@@ -336,6 +332,8 @@ BTF_ID(func, bpf_lsm_sb_umount)
 BTF_ID(func, bpf_lsm_settime)
 
 #ifdef CONFIG_SECURITY_NETWORK
+BTF_ID(func, bpf_lsm_inet_conn_established)
+
 BTF_ID(func, bpf_lsm_socket_accept)
 BTF_ID(func, bpf_lsm_socket_bind)
 BTF_ID(func, bpf_lsm_socket_connect)
Signature · 3 lines
2.43.0.429.g432eaa2c6b-goog

/M
CI Applied
#1 lore raw
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:

Quoted 8 lines · On Thu, 1 Feb 2024 10:43:40 +0000 you wrote:

There's already one main CONFIG_SECURITY_NETWORK ifdef block within the sleepable_lsm_hooks BTF set. Consolidate this duplicated ifdef block as there's no need for it and all things guarded by it should remain in one place in this specific context.

Signed-off-by Matt Bobrowski <[email protected]>

[...]

Here is the summary with links:
- [bpf-next] bpf: minor clean-up to sleepable_lsm_hooks BTF set

    https://git.kernel.org/bpf/bpf-next/c/1581e5118e48

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html