[PATCH bpf-next] bpf: minor clean-up to sleepable_lsm_hooks BTF set

[PATCH bpf-next] bpf: minor clean-up to sleepable_lsm_hooks BTF set

[Matt Bobrowski]

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 <mattbobrowski@google.com>
---
 kernel/bpf/bpf_lsm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c
index 63b4dc495125..68240c3c6e7d 100644
--- a/kernel/bpf/bpf_lsm.c
+++ b/kernel/bpf/bpf_lsm.c
@@ -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)
-- 
2.43.0.429.g432eaa2c6b-goog

/M

Re: [PATCH bpf-next] bpf: minor clean-up to sleepable_lsm_hooks BTF set

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:

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 <mattbobrowski@google.com>
> 
> [...]

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!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html