| Message ID | 20210125063936.89365-1-mikko.ylinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 78031381ae9c88f4f914d66154f4745122149c58 |
| Delegated to: | BPF |
| Headers | show |
| Series | [v2] bpf: Drop disabled LSM hooks from the sleepable set | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Mon, Jan 25, 2021 at 7:39 AM Mikko Ylinen <mikko.ylinen@linux.intel.com> wrote: > > Some networking and keys LSM hooks are conditionally enabled > and when building the new sleepable BPF LSM hooks with those > LSM hooks disabled, the following build error occurs: > > BTFIDS vmlinux > FAILED unresolved symbol bpf_lsm_socket_socketpair > > To fix the error, conditionally add the relevant networking/keys > LSM hooks to the sleepable set. > > Fixes: 423f16108c9d8 ("bpf: Augment the set of sleepable LSM hooks") > Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> Acked-by: KP Singh <kpsingh@kernel.org>
Hello: This patch was applied to bpf/bpf.git (refs/heads/master): On Mon, 25 Jan 2021 08:39:36 +0200 you wrote: > Some networking and keys LSM hooks are conditionally enabled > and when building the new sleepable BPF LSM hooks with those > LSM hooks disabled, the following build error occurs: > > BTFIDS vmlinux > FAILED unresolved symbol bpf_lsm_socket_socketpair > > [...] Here is the summary with links: - [v2] bpf: Drop disabled LSM hooks from the sleepable set https://git.kernel.org/bpf/bpf/c/78031381ae9c You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c index 70e5e0b6d69d..1622a44d1617 100644 --- a/kernel/bpf/bpf_lsm.c +++ b/kernel/bpf/bpf_lsm.c @@ -149,7 +149,11 @@ BTF_ID(func, bpf_lsm_file_ioctl) 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) @@ -166,7 +170,11 @@ BTF_ID(func, bpf_lsm_inode_symlink) BTF_ID(func, bpf_lsm_inode_unlink) BTF_ID(func, bpf_lsm_kernel_module_request) BTF_ID(func, bpf_lsm_kernfs_init_security) + +#ifdef CONFIG_KEYS BTF_ID(func, bpf_lsm_key_free) +#endif /* CONFIG_KEYS */ + BTF_ID(func, bpf_lsm_mmap_file) BTF_ID(func, bpf_lsm_netlink_send) BTF_ID(func, bpf_lsm_path_notify) @@ -181,6 +189,8 @@ BTF_ID(func, bpf_lsm_sb_show_options) BTF_ID(func, bpf_lsm_sb_statfs) BTF_ID(func, bpf_lsm_sb_umount) BTF_ID(func, bpf_lsm_settime) + +#ifdef CONFIG_SECURITY_NETWORK BTF_ID(func, bpf_lsm_socket_accept) BTF_ID(func, bpf_lsm_socket_bind) BTF_ID(func, bpf_lsm_socket_connect) @@ -195,6 +205,8 @@ BTF_ID(func, bpf_lsm_socket_recvmsg) BTF_ID(func, bpf_lsm_socket_sendmsg) BTF_ID(func, bpf_lsm_socket_shutdown) BTF_ID(func, bpf_lsm_socket_socketpair) +#endif /* CONFIG_SECURITY_NETWORK */ + BTF_ID(func, bpf_lsm_syslog) BTF_ID(func, bpf_lsm_task_alloc) BTF_ID(func, bpf_lsm_task_getsecid)
Some networking and keys LSM hooks are conditionally enabled and when building the new sleepable BPF LSM hooks with those LSM hooks disabled, the following build error occurs: BTFIDS vmlinux FAILED unresolved symbol bpf_lsm_socket_socketpair To fix the error, conditionally add the relevant networking/keys LSM hooks to the sleepable set. Fixes: 423f16108c9d8 ("bpf: Augment the set of sleepable LSM hooks") Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> --- kernel/bpf/bpf_lsm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)