Commit 78031381 authored by Mikko Ylinen's avatar Mikko Ylinen Committed by Daniel Borkmann
Browse files

bpf: Drop disabled LSM hooks from the sleepable set 



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: 423f1610 ("bpf: Augment the set of sleepable LSM hooks")
Signed-off-by: default avatarMikko Ylinen <mikko.ylinen@linux.intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarKP Singh <kpsingh@kernel.org>
Link: https://lore.kernel.org/bpf/20210125063936.89365-1-mikko.ylinen@linux.intel.com
parent b9557caa

kernel/bpf/bpf_lsm.c

+12 −0
Original line number Diff line number Diff line
@@ -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)