nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

bpf: fix lsm_cgroup build errors on esoteric configs

Browse source 
This particular ones is about having the following:
 CONFIG_BPF_LSM=y
 # CONFIG_CGROUP_BPF is not set

Also, add __maybe_unused to the args for the !CONFIG_NET cases.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/r/20220714185404.3647772-1-sdf@google.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Stanislav Fomichev 2022-07-14 11:54:04 -07:00 committed by Alexei Starovoitov
parent ab850abbcf
commit 3908fcddc6
2 changed files with 7 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/bpf/bpf_lsm.c
View file

@ -63,10 +63,11 @@ BTF_ID(func, bpf_lsm_socket_post_create)
BTF_ID(func, bpf_lsm_socket_socketpair) BTF_ID(func, bpf_lsm_socket_socketpair)
BTF_SET_END(bpf_lsm_unlocked_sockopt_hooks) BTF_SET_END(bpf_lsm_unlocked_sockopt_hooks)
#ifdef CONFIG_CGROUP_BPF
void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog, void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog,
bpf_func_t *bpf_func) bpf_func_t *bpf_func)
{ {
const struct btf_param *args; const struct btf_param *args __maybe_unused;
if (btf_type_vlen(prog->aux->attach_func_proto) < 1 || if (btf_type_vlen(prog->aux->attach_func_proto) < 1 ||
btf_id_set_contains(&bpf_lsm_current_hooks, btf_id_set_contains(&bpf_lsm_current_hooks,
@ -75,9 +76,9 @@ void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog,
return; return;
} }
#ifdef CONFIG_NET
args = btf_params(prog->aux->attach_func_proto); args = btf_params(prog->aux->attach_func_proto);
#ifdef CONFIG_NET
if (args[0].type == btf_sock_ids[BTF_SOCK_TYPE_SOCKET]) if (args[0].type == btf_sock_ids[BTF_SOCK_TYPE_SOCKET])
*bpf_func = __cgroup_bpf_run_lsm_socket; *bpf_func = __cgroup_bpf_run_lsm_socket;
else if (args[0].type == btf_sock_ids[BTF_SOCK_TYPE_SOCK]) else if (args[0].type == btf_sock_ids[BTF_SOCK_TYPE_SOCK])
@ -86,6 +87,7 @@ void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog,
#endif #endif
*bpf_func = __cgroup_bpf_run_lsm_current; *bpf_func = __cgroup_bpf_run_lsm_current;
} }
#endif
int bpf_lsm_verify_prog(struct bpf_verifier_log *vlog, int bpf_lsm_verify_prog(struct bpf_verifier_log *vlog,
const struct bpf_prog *prog) const struct bpf_prog *prog)
@ -219,6 +221,7 @@ bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
case BPF_FUNC_get_retval: case BPF_FUNC_get_retval:
return prog->expected_attach_type == BPF_LSM_CGROUP ? return prog->expected_attach_type == BPF_LSM_CGROUP ?
&bpf_get_retval_proto : NULL; &bpf_get_retval_proto : NULL;
#ifdef CONFIG_NET
case BPF_FUNC_setsockopt: case BPF_FUNC_setsockopt:
if (prog->expected_attach_type != BPF_LSM_CGROUP) if (prog->expected_attach_type != BPF_LSM_CGROUP)
return NULL; return NULL;
@ -239,6 +242,7 @@ bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
prog->aux->attach_btf_id)) prog->aux->attach_btf_id))
return &bpf_unlocked_sk_getsockopt_proto; return &bpf_unlocked_sk_getsockopt_proto;
return NULL; return NULL;
#endif
default: default:
return tracing_prog_func_proto(func_id, prog); return tracing_prog_func_proto(func_id, prog);
} }

2
kernel/bpf/trampoline.c
View file

@ -501,7 +501,7 @@ int bpf_trampoline_unlink_prog(struct bpf_tramp_link *link, struct bpf_trampolin
return err; return err;
} }
#if defined(CONFIG_BPF_JIT) && defined(CONFIG_BPF_SYSCALL) #if defined(CONFIG_CGROUP_BPF) && defined(CONFIG_BPF_LSM)
static void bpf_shim_tramp_link_release(struct bpf_link *link) static void bpf_shim_tramp_link_release(struct bpf_link *link)
{ {
struct bpf_shim_tramp_link *shim_link = struct bpf_shim_tramp_link *shim_link =